--- a/servlib/bundling/BundleProtocol.cc	Thu Aug 18 12:11:00 2011 +0100
+++ b/servlib/bundling/BundleProtocol.cc	Thu Aug 18 12:30:38 2011 +0100
@@ -134,8 +134,14 @@
             }
             
             log_debug_p(LOG, "adding recv_block %d", iter->type());
-            iter->owner()->prepare(bundle, xmit_blocks, &*iter, link,
-                                   BlockInfo::LIST_RECEIVED);
+            find_processor(iter->type())->prepare(bundle, 
+                                                  xmit_blocks,
+                                                  &*iter, 
+                                                  link, 
+                                                  BlockInfo::LIST_RECEIVED);
+
+//            iter->owner()->prepare(bundle, xmit_blocks, &*iter, link,
+//                                   BlockInfo::LIST_RECEIVED);
         }
     }
     else {
@@ -152,8 +158,14 @@
          ++iter)
     {
         log_debug_p(LOG, "adding api_block %d", iter->type());
-        iter->owner()->prepare(bundle, xmit_blocks, 
-                               &*iter, link, BlockInfo::LIST_API);
+        find_processor(iter->type())->prepare(bundle, 
+                                              xmit_blocks,
+                                              &*iter, 
+                                              link, 
+                                              BlockInfo::LIST_API);
+
+//        iter->owner()->prepare(bundle, xmit_blocks, 
+//                               &*iter, link, BlockInfo::LIST_API);
     }
 
     // now we also make sure to prepare() on any registered processors