More robust fix of z-index in Safari