some fix to 2d code
some fix to 2d code
some fix to 2d code