Firefox fix
General commit