Invert z-ordering
Fix linked contours moving