Index: /branches/v5/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp
===================================================================
--- /branches/v5/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 366)
+++ /branches/v5/modules/vci_mem_cache/caba/source/src/vci_mem_cache.cpp	(revision 367)
@@ -7433,6 +7433,4 @@
     case CC_SEND_CLEANUP_ACK:
       {
-        uint64_t flit = 0;
-  
         uint8_t cleanup_ack_type;
         if(r_cleanup_to_cc_send_inst.read())
@@ -7444,4 +7442,9 @@
           cleanup_ack_type = DspinDhccpParam::TYPE_CLEANUP_ACK_DATA;
         }
+
+        uint64_t flit = 0;
+        uint64_t dest =
+          r_cleanup_to_cc_send_srcid.read() << 
+          (DspinDhccpParam::SRCID_WIDTH - vci_param::S);
 
         DspinDhccpParam::dspin_set(
@@ -7452,5 +7455,5 @@
         DspinDhccpParam::dspin_set(
             flit,
-            r_cleanup_to_cc_send_srcid.read(),
+            dest,
             DspinDhccpParam::CLEANUP_ACK_DEST);
 
@@ -7491,8 +7494,11 @@
 
         uint64_t flit = 0;
+        uint64_t dest =
+          m_xram_rsp_to_cc_send_srcid_fifo.read() << 
+          (DspinDhccpParam::SRCID_WIDTH - vci_param::S);
 
         DspinDhccpParam::dspin_set(
             flit,
-            m_xram_rsp_to_cc_send_srcid_fifo.read(),
+            dest,
             DspinDhccpParam::MULTI_INVAL_DEST);
 
@@ -7641,8 +7647,11 @@
 
         uint64_t flit = 0;
+        uint64_t dest =
+          m_write_to_cc_send_srcid_fifo.read() << 
+          (DspinDhccpParam::SRCID_WIDTH - vci_param::S);
 
         DspinDhccpParam::dspin_set(
             flit,
-            m_write_to_cc_send_srcid_fifo.read(),
+            dest,
             DspinDhccpParam::MULTI_UPDT_DEST);
 
@@ -7745,8 +7754,11 @@
 
         uint64_t flit = 0;
+        uint64_t dest =
+          m_cas_to_cc_send_srcid_fifo.read() << 
+          (DspinDhccpParam::SRCID_WIDTH - vci_param::S);
 
         DspinDhccpParam::dspin_set(
             flit,
-            m_cas_to_cc_send_srcid_fifo.read(),
+            dest,
             DspinDhccpParam::MULTI_UPDT_DEST);