diff --git a/src/npair.cpp b/src/npair.cpp
index 6ea4e62550904b7dbc2d9e2a07c755fe2b5e59ae..7f5956d0409cb6bd277f256c139489ce5bf0f982 100644
--- a/src/npair.cpp
+++ b/src/npair.cpp
@@ -24,7 +24,8 @@ using namespace LAMMPS_NS;
 
 /* ---------------------------------------------------------------------- */
 
-NPair::NPair(LAMMPS *lmp) : Pointers(lmp)
+NPair::NPair(LAMMPS *lmp)
+  : Pointers(lmp), nb(NULL), ns(NULL), bins(NULL), stencil(NULL)
 {
   last_build = -1;
   last_copy_bin_setup = last_copy_bin = last_copy_stencil = -1;
@@ -130,11 +131,11 @@ void NPair::build_setup()
     copy_bin_setup_info();
     last_copy_bin_setup = update->ntimestep;
   }
-  if (nb && last_copy_bin < nb->last_bin_memory) {
+  if (nb && ((last_copy_bin < nb->last_bin_memory) || (bins != nb->bins))) {
     copy_bin_info();
     last_copy_bin = update->ntimestep;
   }
-  if (ns && last_copy_stencil < ns->last_create) {
+  if (ns && ((last_copy_stencil < ns->last_create) || (stencil != ns->stencil))) {
     copy_stencil_info();
     last_copy_stencil = update->ntimestep;
   }