Fix ComputeSurface2D