Fix z-index issue on 2.x