diff --git a/src/atom.cpp b/src/atom.cpp
index 61555ab21d..af2c68a248 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -602,7 +602,7 @@ void Atom::data_atoms(int n, char *buf)
       imagedata = 
         (((tagint) atoi(values[iptr+2]) + IMGMAX & IMGMASK) << IMG2BITS) |
         (((tagint) atoi(values[iptr+1]) + IMGMAX & IMGMASK) << IMGBITS) |
-        (atoi(values[iptr]) + IMGMASK & IMGMASK);
+        (atoi(values[iptr]) + IMGMAX & IMGMASK);
     else imagedata = ((tagint) IMGMAX << IMG2BITS) | 
            ((tagint) IMGMAX << IMGBITS) | IMGMAX;
 
diff --git a/src/create_atoms.cpp b/src/create_atoms.cpp
index 1f493c6055..82075d4fa1 100644
--- a/src/create_atoms.cpp
+++ b/src/create_atoms.cpp
@@ -272,7 +272,7 @@ void CreateAtoms::add_single()
 
   if (remapflag) {
     tagint imagetmp = ((tagint) IMGMAX << IMG2BITS) | 
-      ((tagint) IMGMASK << IMGBITS) | IMGMAX;
+      ((tagint) IMGMAX << IMGBITS) | IMGMAX;
     domain->remap(xone,imagetmp);
   }
 
diff --git a/src/fix_rigid.cpp b/src/fix_rigid.cpp
index 1a5afbb37b..c4b6a0052e 100644
--- a/src/fix_rigid.cpp
+++ b/src/fix_rigid.cpp
@@ -1652,7 +1652,7 @@ void FixRigid::setup_bodies()
 
   for (ibody = 0; ibody < nbody; ibody++)
     imagebody[ibody] = ((tagint) IMGMAX << IMG2BITS) | 
-      ((tagint) IMGMASK << IMGBITS) | IMGMAX;
+      ((tagint) IMGMAX << IMGBITS) | IMGMAX;
 
   pre_neighbor();