Better safari support