FC bug fix