diff --git a/src/CLASS2/angle_class2.cpp b/src/CLASS2/angle_class2.cpp
index 7c9bd2918b..b1830b32b8 100644
--- a/src/CLASS2/angle_class2.cpp
+++ b/src/CLASS2/angle_class2.cpp
@@ -102,7 +102,7 @@ void AngleClass2::compute(int eflag, int vflag)
     delx1 = x[i1][0] - x[i2][0];
     dely1 = x[i1][1] - x[i2][1];
     delz1 = x[i1][2] - x[i2][2];
-    domain->minimum_image(&delx1,&dely1,&delz1);
+    domain->minimum_image(delx1,dely1,delz1);
 
     rsq1 = delx1*delx1 + dely1*dely1 + delz1*delz1;
     r1 = sqrt(rsq1);
@@ -112,7 +112,7 @@ void AngleClass2::compute(int eflag, int vflag)
     delx2 = x[i3][0] - x[i2][0];
     dely2 = x[i3][1] - x[i2][1];
     delz2 = x[i3][2] - x[i2][2];
-    domain->minimum_image(&delx2,&dely2,&delz2);
+    domain->minimum_image(delx2,dely2,delz2);
 
     rsq2 = delx2*delx2 + dely2*dely2 + delz2*delz2;
     r2 = sqrt(rsq2);
diff --git a/src/CLASS2/bond_class2.cpp b/src/CLASS2/bond_class2.cpp
index 2327421ade..579bb24326 100644
--- a/src/CLASS2/bond_class2.cpp
+++ b/src/CLASS2/bond_class2.cpp
@@ -79,7 +79,7 @@ void BondClass2::compute(int eflag, int vflag)
     delx = x[i1][0] - x[i2][0];
     dely = x[i1][1] - x[i2][1];
     delz = x[i1][2] - x[i2][2];
-    domain->minimum_image(&delx,&dely,&delz);
+    domain->minimum_image(delx,dely,delz);
 
     rsq = delx*delx + dely*dely + delz*delz;
     r = sqrt(rsq);
diff --git a/src/CLASS2/dihedral_class2.cpp b/src/CLASS2/dihedral_class2.cpp
index 6936ef9ed1..26716de1ef 100644
--- a/src/CLASS2/dihedral_class2.cpp
+++ b/src/CLASS2/dihedral_class2.cpp
@@ -149,26 +149,26 @@ void DihedralClass2::compute(int eflag, int vflag)
     delx1 = x[i1][0] - x[i2][0];
     dely1 = x[i1][1] - x[i2][1];
     delz1 = x[i1][2] - x[i2][2];
-    domain->minimum_image(&delx1,&dely1,&delz1);
+    domain->minimum_image(delx1,dely1,delz1);
 
     // 2nd bond
 
     delx2 = x[i3][0] - x[i2][0];
     dely2 = x[i3][1] - x[i2][1];
     delz2 = x[i3][2] - x[i2][2];
-    domain->minimum_image(&delx2,&dely2,&delz2);
+    domain->minimum_image(delx2,dely2,delz2);
 
     delx2m = -delx2;
     dely2m = -dely2;
     delz2m = -delz2;
-    domain->minimum_image(&delx2m,&dely2m,&delz2m);
+    domain->minimum_image(delx2m,dely2m,delz2m);
 
     // 3rd bond
 
     delx3 = x[i4][0] - x[i3][0];
     dely3 = x[i4][1] - x[i3][1];
     delz3 = x[i4][2] - x[i3][2];
-    domain->minimum_image(&delx3,&dely3,&delz3);
+    domain->minimum_image(delx3,dely3,delz3);
 
     // distances
 
diff --git a/src/CLASS2/improper_class2.cpp b/src/CLASS2/improper_class2.cpp
index b7091b0220..48ab7b95c3 100644
--- a/src/CLASS2/improper_class2.cpp
+++ b/src/CLASS2/improper_class2.cpp
@@ -128,17 +128,17 @@ void ImproperClass2::compute(int eflag, int vflag)
     delr[0][0] = x[i1][0] - x[i2][0];
     delr[0][1] = x[i1][1] - x[i2][1];
     delr[0][2] = x[i1][2] - x[i2][2];
-    domain->minimum_image(&delr[0][0],&delr[0][1],&delr[0][2]);
+    domain->minimum_image(delr[0]);
 
     delr[1][0] = x[i3][0] - x[i2][0];
     delr[1][1] = x[i3][1] - x[i2][1];
     delr[1][2] = x[i3][2] - x[i2][2];
-    domain->minimum_image(&delr[1][0],&delr[1][1],&delr[1][2]);
+    domain->minimum_image(delr[1]);
 
     delr[2][0] = x[i4][0] - x[i2][0];
     delr[2][1] = x[i4][1] - x[i2][1];
     delr[2][2] = x[i4][2] - x[i2][2];
-    domain->minimum_image(&delr[2][0],&delr[2][1],&delr[2][2]);
+    domain->minimum_image(delr[2]);
 
     // bond lengths and associated values
 
@@ -695,17 +695,17 @@ void ImproperClass2::angleangle(int eflag, int vflag)
     delxAB = x[i1][0] - x[i2][0];
     delyAB = x[i1][1] - x[i2][1];
     delzAB = x[i1][2] - x[i2][2];
-    domain->minimum_image(&delxAB,&delyAB,&delzAB);
+    domain->minimum_image(delxAB,delyAB,delzAB);
 
     delxBC = x[i3][0] - x[i2][0];
     delyBC = x[i3][1] - x[i2][1];
     delzBC = x[i3][2] - x[i2][2];
-    domain->minimum_image(&delxBC,&delyBC,&delzBC);
+    domain->minimum_image(delxBC,delyBC,delzBC);
 
     delxBD = x[i4][0] - x[i2][0];
     delyBD = x[i4][1] - x[i2][1];
     delzBD = x[i4][2] - x[i2][2];
-    domain->minimum_image(&delxBD,&delyBD,&delzBD);
+    domain->minimum_image(delxBD,delyBD,delzBD);
 
     // bond lengths