Layout FO fix