Fixed issue(s) with Firefox