Has the z-index fix from the other pull request