fixed issues with Firefox