Fixing issue with Firefox