2 files changed, 5 insertions, 3 deletions

diff --git a/src/Data/Wrapper/PSQ.hs b/src/Data/Wrapper/PSQ.hs
index 87648e84..58a6f624 100644
--- a/src/Data/Wrapper/PSQ.hs
+++ b/src/Data/Wrapper/PSQ.hs
@@ -62,7 +62,7 @@ insertWith :: (PSQKey k, Ord p) => (p -> p -> p) -> k -> p -> PSQ k p -> PSQ k p
 insertWith f k p0 q = snd $ Q.alter f' k q
  where
     f' (Just (p,())) = ((),Just (f p0 p, ()))
-    f' Nothing      = ((),Nothing)
+    f' Nothing       = ((),Just (p0,()))
 {-# INLINE insertWith #-}
 
 singleton :: (PSQKey k, Ord p) => k -> p -> PSQ k p
diff --git a/src/Network/BitTorrent/DHT/ContactInfo.hs b/src/Network/BitTorrent/DHT/ContactInfo.hs
index b7d7f2a2..9c336f93 100644
--- a/src/Network/BitTorrent/DHT/ContactInfo.hs
+++ b/src/Network/BitTorrent/DHT/ContactInfo.hs
@@ -174,10 +174,12 @@ swarmSingleton a = SwarmData
     , name = Nothing }
 
 swarmInsert :: SwarmData -> SwarmData -> SwarmData
-swarmInsert old new = SwarmData
-    { peers = L.foldl' (\q (a :-> t) -> PSQ.insertWith (\p _ -> p) a t q) (peers old) (PSQ.toList $ peers new)
+swarmInsert new old = SwarmData
+    { peers = L.foldl' (\q (a :-> t) -> PSQ.insertWith newerTimeStamp a t q) (peers old) (PSQ.toList $ peers new)
     , name = name new <|> name old -- TODO: decodeUtf8' check
     }
+ where
+    newerTimeStamp newtime oldtime = if newtime > oldtime then newtime else oldtime
 
 isSwarmOccupied SwarmData{..} = not $ PSQ.null peers