Updated fix for Safari