diff --git a/ompi/mca/mtl/mx/mtl_mx.c b/ompi/mca/mtl/mx/mtl_mx.c
index 5b250654e5..1a6bf35aeb 100644
--- a/ompi/mca/mtl/mx/mtl_mx.c
+++ b/ompi/mca/mtl/mx/mtl_mx.c
@@ -39,7 +39,7 @@ mca_mtl_mx_module_t ompi_mtl_mx = {
         ompi_mtl_mx_del_procs,
         ompi_mtl_mx_finalize,
         
-        ompi_mtl_mx_send,  /* don't use ompi_mtl_mx_send.. */
+        ompi_mtl_mx_send,
         ompi_mtl_mx_isend,
         
         ompi_mtl_mx_irecv,
diff --git a/ompi/mca/pml/cm/pml_cm_send.c b/ompi/mca/pml/cm/pml_cm_send.c
index 9a4041313e..9cff1cbfa9 100644
--- a/ompi/mca/pml/cm/pml_cm_send.c
+++ b/ompi/mca/pml/cm/pml_cm_send.c
@@ -89,7 +89,8 @@ mca_pml_cm_send(void *buf,
                                  datatype, dst, tag, comm, 
                                  sendmode, true, false);
 
-    if (NULL == ompi_mtl->mtl_send) {
+    if (sendreq->req_send.req_send_mode == MCA_PML_BASE_SEND_BUFFERED || 
+        NULL == ompi_mtl->mtl_send) {
         MCA_PML_CM_SEND_REQUEST_START(sendreq, ret);
         if (OMPI_SUCCESS != ret) {
             MCA_PML_CM_SEND_REQUEST_RETURN(sendreq);