Fixing safari issue