--- a/servlib/bundling/BundleDaemon.cc	Mon Aug 15 13:42:11 2011 +0100
+++ b/servlib/bundling/BundleDaemon.cc	Mon Aug 15 14:06:57 2011 +0100
@@ -922,9 +922,14 @@
 
     // If the even source is PEER or STORE,
     // try to handle a BPQ block
-    if ( event->source_ == EVENTSRC_PEER || 
-         event->source_ == EVENTSRC_STORE ) {
-        handle_bpq_block(bundle, event);
+    if ( event->source_ == EVENTSRC_PEER  || 
+         event->source_ == EVENTSRC_STORE ||
+         event->source_ == EVENTSRC_FRAGMENTATION) {
+
+        // TODO: change this to allow fragment responses be sent
+        if ( ! bundle->is_fragment() ) {
+            handle_bpq_block(bundle, event);
+        }
     }
 
     // If the bundle contains a BPQ query that was successfully answered