diff --git a/src/atm_init.c b/src/atm_init.c
index 4a98895ad..84e4c451b 100644
--- a/src/atm_init.c
+++ b/src/atm_init.c
@@ -123,7 +123,7 @@ int main(
 	    }
 
 	    /* Set particle counter... */
-	    if ((++atm->np) >= NP)
+	    if ((++atm->np) > NP)
 	      ERRMSG("Too many particles!");
 	  }
 
diff --git a/src/atm_select.c b/src/atm_select.c
index 892bf4325..1b681e9a0 100644
--- a/src/atm_select.c
+++ b/src/atm_select.c
@@ -153,7 +153,7 @@ int main(
       atm2->lat[atm2->np] = atm->lat[ip];
       for (int iq = 0; iq < ctl.nq; iq++)
 	atm2->q[iq][atm2->np] = atm->q[iq][ip];
-      if ((++atm2->np) >= NP)
+      if ((++atm2->np) > NP)
 	ERRMSG("Too many air parcels!");
     }
   }
diff --git a/src/atm_split.c b/src/atm_split.c
index fbfc95b76..60c45fe1c 100644
--- a/src/atm_split.c
+++ b/src/atm_split.c
@@ -148,7 +148,7 @@ int main(
       atm2->q[ctl.qnt_idx][atm2->np] = atm2->np;
 
     /* Increment particle counter... */
-    if ((++atm2->np) >= NP)
+    if ((++atm2->np) > NP)
       ERRMSG("Too many air parcels!");
   }
 
diff --git a/src/mptrac.c b/src/mptrac.c
index b239408d6..2394ddc9c 100644
--- a/src/mptrac.c
+++ b/src/mptrac.c
@@ -3033,7 +3033,7 @@ void module_isosurf_init(
     while (fgets(line, LEN, in))
       if (sscanf(line, "%lg %lg", &(cache->iso_ts[cache->iso_n]),
 		 &(cache->iso_ps[cache->iso_n])) == 2)
-	if ((++cache->iso_n) >= NP)
+	if ((++cache->iso_n) > NP)
 	  ERRMSG("Too many data points!");
 
     /* Check number of points... */
@@ -4239,7 +4239,7 @@ int read_atm_asc(
     atm->p[atm->np] = P(atm->p[atm->np]);
 
     /* Increment data point counter... */
-    if ((++atm->np) >= NP)
+    if ((++atm->np) > NP)
       ERRMSG("Too many data points!");
   }