Further contour bug fix again