Fix for the z-index change