diff --git a/src/atom.cpp b/src/atom.cpp
index 24ad2d40da..de5d30930a 100644
--- a/src/atom.cpp
+++ b/src/atom.cpp
@@ -211,7 +211,7 @@ Atom::Atom(LAMMPS *lmp) : Pointers(lmp)
   tag_enable = 1;
   map_style = map_user = 0;
   map_tag_max = -1;
-  map_maxarray = map_nhash = -1;
+  map_maxarray = map_nhash = map_nbucket = -1;
 
   max_same = 0;
   sametag = NULL;
diff --git a/src/atom_map.cpp b/src/atom_map.cpp
index 7949e327a9..c23aeec83c 100644
--- a/src/atom_map.cpp
+++ b/src/atom_map.cpp
@@ -335,7 +335,7 @@ void Atom::map_delete()
       map_bucket = NULL;
       map_hash = NULL;
     }
-    map_nhash = 0;
+    map_nhash = map_nbucket = 0;
   }
 }