Fixing Firefox issue