1 files changed, 6 insertions, 6 deletions

diff --git a/src/Network/DHT/Mainline.hs b/src/Network/DHT/Mainline.hs
index e5517a3a..d68755a7 100644
--- a/src/Network/DHT/Mainline.hs
+++ b/src/Network/DHT/Mainline.hs
@@ -154,7 +154,7 @@ read_only_key = "ro"
 #ifdef VERSION_bencoding
 instance BEncode a => BEncode (Query KMessageOf a) where
   toBEncode Query {..} = toDict $
-      BDict.union ( node_id_key .=! queringNodeId
+      BDict.union ( node_id_key .=! queringNodeId queryExtra
                    .: read_only_key .=? bool Nothing (Just (1 :: Integer)) (queryIsReadOnly queryExtra)
                    .: endDict)
                   (dict (toBEncode queryParams))
@@ -162,9 +162,9 @@ instance BEncode a => BEncode (Query KMessageOf a) where
       dict (BDict d) = d
       dict    _      = error "impossible: instance BEncode (Query a)"
 
-  fromBEncode v = do
-    Query <$> fromDict (field (req node_id_key)) v
-          <*> fromDict (IsReadOnlyQuery . fromMaybe False <$>? read_only_key) v
+  fromBEncode v =
+    Query <$> (MainlineQuery <$> fromDict (field (req node_id_key)) v
+                             <*> fromDict (fromMaybe False <$>? read_only_key) v)
           <*> fromBEncode v
 #else
 data Query a = Query a
@@ -174,11 +174,11 @@ data Query a = Query a
 instance BEncode a => BEncode (Response KMessageOf a) where
   toBEncode = toBEncode . toQuery
     where
-      toQuery (Response nid MainlineResponseData a) = Query nid (IsReadOnlyQuery False) a
+      toQuery (Response (MainlineResponse nid) a) = Query (MainlineQuery nid False) a
 
   fromBEncode b = fromQuery <$> fromBEncode b
     where
-      fromQuery (Query nid _ a) = Response nid MainlineResponseData a
+      fromQuery (Query (MainlineQuery nid _) a) = Response (MainlineResponse nid) a
 #else
 data Response KMessageOf a = Response KMessageOf a
 #endif