Fixed issue with Firefox