Fixed Safari support