Fix for future versions of Safari