Fix Safari bug attempt 2