Minor z-order bug fixed