1 files changed, 7 insertions, 6 deletions

diff --git a/src/Network/BitTorrent/DHT/Message.hs b/src/Network/BitTorrent/DHT/Message.hs
index d31cce82..1f835fa6 100644
--- a/src/Network/BitTorrent/DHT/Message.hs
+++ b/src/Network/BitTorrent/DHT/Message.hs
@@ -84,8 +84,9 @@ module Network.BitTorrent.DHT.Message
        ) where
 
 import Control.Applicative
+import Data.Bool
 import Data.BEncode as BE
-import Data.BEncode.BDict
+import Data.BEncode.BDict as BDict
 import Data.ByteString (ByteString)
 import Data.List as L
 import Data.Monoid
@@ -121,12 +122,12 @@ data Query a = Query
 
 instance BEncode a => BEncode (Query a) where
   toBEncode Query {..} = toDict $
-      node_id_key .=! queringNodeId .: endDict
-      <>
-      dict (toBEncode queryParams)
+      BDict.union ( node_id_key .=! queringNodeId
+                   .: read_only_key .=? bool Nothing (Just (1 :: Integer)) queryIsReadOnly
+                   .: endDict)
+                  (dict (toBEncode queryParams))
     where
-      dict (BDict d) | queryIsReadOnly = Cons read_only_key (BInteger 1) d
-                     | otherwise       = d
+      dict (BDict d) = d
       dict    _      = error "impossible: instance BEncode (Query a)"
 
   fromBEncode v = do