BZ-12511: Fix for Firefox