Fixing safari problem