Modifying fix for Firefox