Fix FF bug