[3.8] Fix #1425 Zindex issue

- Fix #1425