Fix #1425 Zindex issue