Please fix the FC bugs

Thank you,
Zirovanes