FF bug fixed