A general fix to FC