Fix Firefox feature/bug