Fixed (but not tested) SURROUNDINGCURVE@