FF bug fix