Make lfc layout more robust