Index: trunk/Ohana/src/opihi/pcontrol/CheckSystem.c
===================================================================
--- trunk/Ohana/src/opihi/pcontrol/CheckSystem.c	(revision 10693)
+++ trunk/Ohana/src/opihi/pcontrol/CheckSystem.c	(revision 11898)
@@ -88,7 +88,9 @@
 
     if ((RunLevel == PCONTROL_RUN_ALL) || (RunLevel == PCONTROL_RUN_REAP)) {
-      Njobchecks  += CheckBusyJobs(0.020);  /* get job status */
-      Njobchecks  += CheckDoneJobs(0.020);  /* harvest job stdout/stderr */
-      Njobchecks  += CheckKillJobs(0.020);  /* harvest job stdout/stderr */
+      Njobchecks  += CheckBusyJobs(0.020);  /* get job status (PCLIENT) */
+      TestCheckPoint ();
+      Njobchecks  += CheckDoneJobs(0.020);  /* harvest job stdout/stderr (!PCLIENT) */
+      TestCheckPoint ();
+      Njobchecks  += CheckKillJobs(0.020);  /* harvest job stdout/stderr (PCLIENT) */
       TestCheckPoint ();
     }
@@ -96,4 +98,5 @@
     if (RunLevel != PCONTROL_RUN_NONE) {
       Nhostchecks += CheckDoneHosts(0.020); /* reset the host */
+      TestCheckPoint ();
       Nhostchecks += CheckDownHosts(0.100); /* launch the host */
       TestCheckPoint ();
@@ -102,5 +105,5 @@
     if (RunLevel == PCONTROL_RUN_ALL) {
       // we want to give each block a maximum allowed time
-      Nhostchecks += CheckIdleHosts(0.020); /* submit a new job */
+      Nhostchecks += CheckIdleHosts(0.020); /* submit a new job (PCLIENT) */
       TestCheckPoint ();
     }