Finally fix FC