fa bug fix