Fixed Firefox support