Fixing Firefox support