mapContour() improvement (issue 404)