Fix 2D index