fix for safari
Merge branch 'safari'