Improved the firefox bug fix