Fixed Safari issue