Try and improve FEC issues