1 files changed, 10 insertions, 4 deletions

diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index 1c68249e..9a9c893a 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -321,12 +321,18 @@ instance Read NodeInfo where
     let n = 43 -- characters in node id.
         parseAddr = RP.between (RP.char '(') (RP.char ')') (RP.munch (/=')'))
                       RP.+++ RP.munch (\c -> not (isSpace c) && not (c `elem` ("{}()"::[Char])))
-        nodeidAt = do hexhash <- sequence $ replicate n (RP.satisfy b64digit)
+        nodeidAt = do (is64,hexhash) <-
+                        fmap (True,) (sequence $ replicate n (RP.satisfy b64digit))
+                          RP.+++ fmap (False,) (sequence $ replicate 64 (RP.satisfy isHexDigit))
                       RP.char '@' RP.+++ RP.satisfy isSpace
                       addrstr <- parseAddr
-                      nid <- case Base64.decode $ C8.pack $ 'A' : map (nmtoken64 False) hexhash of
-                              Right bs | B.length bs - 1==32 -> return (bs2id $ BA.drop 1 bs)
-                              _                              -> fail "Bad node id."
+                      nid <- if is64
+                                then case Base64.decode $ C8.pack $ 'A' : map (nmtoken64 False) hexhash of
+                                  Right bs | B.length bs - 1==32 -> return (bs2id $ BA.drop 1 bs)
+                                  _                              -> fail "Bad node id."
+                                else case Base16.decode $ C8.pack hexhash of
+                                  (bs,rem) | B.length bs == 32 &&  B.null rem -> return (bs2id bs)
+                                  _                                           -> fail "Bad node id."
                       return (nid,addrstr)
     (nid,addrstr) <- ( nodeidAt RP.+++ ( (zeroID,) <$> parseAddr) )
     (ip,port) <- case RP.readP_to_S (ip_w_port i) addrstr of