Fix Firefox Issue