Fix for Safari