Fixed FF bug