fix all 2D-2Class