Fix for Safari issue