Safari issue, fixed #1