diff --git a/src/datatype/dt_unpack.c b/src/datatype/dt_unpack.c
index 30869c2a74..da556d5483 100644
--- a/src/datatype/dt_unpack.c
+++ b/src/datatype/dt_unpack.c
@@ -274,7 +274,7 @@ static int ompi_convertor_unpack_homogeneous( ompi_convertor_t* pConv,
     last_count = 0;  /* complete the data */
  end_loop:
     if( last_count != 0 ) { /* save the internal state */
-        OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, last_blength,
+        OMPI_DDT_SAFEGUARD_POINTER( pConv->pBaseBuf + lastDisp, last_count,
                                     pConv->pBaseBuf, pData, pConv->count );
         MEMCPY( pConv->pBaseBuf + lastDisp, pSrcBuf, last_count );
         bConverted += last_count;