Fix 2*D to 2D