Fix for Firefox Compatibility Issues