Fix Safari issue