PFM 1.6 Commit : Fix FC [Maybe Perfect]