diff --git a/src/main/java/fiji/plugin/trackmate/detection/Process2DZ.java b/src/main/java/fiji/plugin/trackmate/detection/Process2DZ.java
index f364529e0..7b071fc6a 100644
--- a/src/main/java/fiji/plugin/trackmate/detection/Process2DZ.java
+++ b/src/main/java/fiji/plugin/trackmate/detection/Process2DZ.java
@@ -243,8 +243,9 @@ public boolean process()
 			newSpot.putFeature( Spot.QUALITY, Double.valueOf( avgQuality ) );
 
 			// Shift them by interval min.
-			for ( int d = 0; d < 3; d++ )
-				newSpot.move( interval.min( d ) * calibration[ d ], d );
+			newSpot.move( interval.min( img.dimensionIndex( Axes.X ) ) * calibration[ 0 ], 0 );
+			newSpot.move( interval.min( img.dimensionIndex( Axes.Y ) ) * calibration[ 1 ], 1 );
+			newSpot.move( interval.min( img.dimensionIndex( Axes.Z ) ) * calibration[ 2 ], 2 );
 
 			spots.add( newSpot );
 		}