Rendering order fix