Attempt to make things work for Safari