fixed safari issue finally