Index: src/mpid/ch3/channels/nemesis/src/ch3_progress.c
===================================================================
--- src/mpid/ch3/channels/nemesis/src/ch3_progress.c	(revision 7482)
+++ src/mpid/ch3/channels/nemesis/src/ch3_progress.c	(working copy)
@@ -241,20 +241,6 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *prog
         MPIU_Assert(progress_state != NULL);
     }
 
-#ifdef ENABLE_CHECKPOINTING
-    if (MPIR_PARAM_ENABLE_CKPOINT) {
-        if (MPIDI_nem_ckpt_start_checkpoint) {
-            MPIDI_nem_ckpt_start_checkpoint = FALSE;
-            mpi_errno = MPIDI_nem_ckpt_start();
-            if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-        }
-        if (MPIDI_nem_ckpt_finish_checkpoint) {
-            MPIDI_nem_ckpt_finish_checkpoint = FALSE;
-            mpi_errno = MPIDI_nem_ckpt_finish();
-            if (mpi_errno) MPIU_ERR_POP(mpi_errno);
-        }
-    }
-#endif
 
     do
     {
@@ -298,6 +284,21 @@ int MPIDI_CH3I_Progress (MPID_Progress_state *prog
         }
         ++pollcount;
 #endif
+        
+#ifdef ENABLE_CHECKPOINTING
+    if (MPIR_PARAM_ENABLE_CKPOINT) {
+        if (MPIDI_nem_ckpt_start_checkpoint) {
+            MPIDI_nem_ckpt_start_checkpoint = FALSE;
+            mpi_errno = MPIDI_nem_ckpt_start();
+            if (mpi_errno) MPIU_ERR_POP(mpi_errno);
+        }
+        if (MPIDI_nem_ckpt_finish_checkpoint) {
+            MPIDI_nem_ckpt_finish_checkpoint = FALSE;
+            mpi_errno = MPIDI_nem_ckpt_finish();
+            if (mpi_errno) MPIU_ERR_POP(mpi_errno);
+        }
+    }
+#endif
         do /* receive progress */
         {