Fix Firefox Bug part2