Fix issue #2 - Firefox