fix bug in safari browser
Merge branch 'hotfix/safari-fix' into dev