diff -r 5832202f8a44 -r f1d80668861b servlib/bundling/BundleProtocol.cc
--- a/servlib/bundling/BundleProtocol.cc	Tue Aug 16 16:08:39 2011 +0100
+++ b/servlib/bundling/BundleProtocol.cc	Thu Aug 18 11:30:52 2011 +0100
@@ -168,11 +168,12 @@
             continue;
         }
 
-        if (! xmit_blocks->has_block(i) &&
-            i != BundleProtocol::QUERY_EXTENSION_BLOCK) {
+        if (! xmit_blocks->has_block(i)) {
+
             if (i == BundleProtocol::QUERY_EXTENSION_BLOCK)
                 log_debug_p(LOG, "adding extra BPQ block!!!");
-            bp->prepare(bundle, xmit_blocks, NULL, link, BlockInfo::LIST_NONE);
+            else
+                bp->prepare(bundle, xmit_blocks, NULL, link, BlockInfo::LIST_NONE);
         }
     }