Fixed safari issue