Fix bug from e2408ace with some wrong calls layOutForWidth - this have been produce some wrong entries replacement