Fix Safari problem