2 files changed, 6 insertions, 4 deletions

diff --git a/src/Network/BitTorrent/PeerWire/Message.hs b/src/Network/BitTorrent/PeerWire/Message.hs
index 6515fdf2..3895ed5f 100644
--- a/src/Network/BitTorrent/PeerWire/Message.hs
+++ b/src/Network/BitTorrent/PeerWire/Message.hs
@@ -7,6 +7,7 @@ module Network.BitTorrent.PeerWire.Message
 
 import Control.Applicative
 import qualified Data.ByteString as B
+import qualified Data.ByteString.Lazy as Lazy
 import Data.Serialize
 import Text.PrettyPrint
 import Network
@@ -91,7 +92,7 @@ instance Serialize Message where
           0x02 -> return Interested
           0x03 -> return NotInterested
           0x04 -> Have     <$> getInt
-          0x05 -> Bitfield <$> getBitfield (pred len)
+          0x05 -> (Bitfield . fromBitmap) <$> getByteString (pred len)
           0x06 -> Request  <$> get
           0x07 -> Piece    <$> getBlock (len - 9)
           0x08 -> Cancel   <$> get
@@ -118,8 +119,9 @@ instance Serialize Message where
   put Interested    = putInt 1  >> putWord8 0x02
   put NotInterested = putInt 1  >> putWord8 0x03
   put (Have i)      = putInt 5  >> putWord8 0x04 >> putInt i
-  put (Bitfield b)  = putInt l  >> putWord8 0x05 >> putBitfield b
-    where l = succ (bitfieldByteCount b)
+  put (Bitfield bf) = putInt l  >> putWord8 0x05 >> putLazyByteString b
+    where b = toBitmap bf
+          l = succ (fromIntegral (Lazy.length b))
           {-# INLINE l #-}
   put (Request blk) = putInt 13 >> putWord8 0x06 >> put blk
   put (Piece   blk) = putInt l  >> putWord8 0x07 >> putBlock
diff --git a/src/Network/BitTorrent/Tracker.hs b/src/Network/BitTorrent/Tracker.hs
index 2e599002..aaa08f3c 100644
--- a/src/Network/BitTorrent/Tracker.hs
+++ b/src/Network/BitTorrent/Tracker.hs
@@ -145,7 +145,7 @@ data TSession = TSession {
 newSession :: Progress -> Int -> [PeerAddr] -> IO TSession
 newSession pr i ps = TSession <$> newTVarIO pr
                               <*> newIORef i
-                              <*> newTVarIO psx
+                              <*> newTVarIO ps
 
 getPeerList :: TSession -> IO [PeerAddr]
 getPeerList = readTVarIO . sePeers