Beach z-order fix
z-order fix