1 files changed, 4 insertions, 2 deletions

diff --git a/src/Network/Tox/NodeId.hs b/src/Network/Tox/NodeId.hs
index bba56e27..20dc1854 100644
--- a/src/Network/Tox/NodeId.hs
+++ b/src/Network/Tox/NodeId.hs
@@ -213,8 +213,10 @@ instance FromJSON NodeInfo where
         ip <- maybe empty (return . IPv6) (ip6str >>= readMaybe)
               <|> maybe empty (return . IPv4) (ip4str >>= readMaybe)
         let (bs,_) = Base16.decode (C8.pack nidstr)
-        guard (B.length bs == 32)
-        return $ NodeInfo (bs2id bs) ip (fromIntegral (portnum :: Word16))
+            enid   = Base64.decode (C8.pack $ 'A' : map (nmtoken64 False) nidstr)
+        idbs <- (guard (B.length bs == 32) >> return bs)
+                <|> either fail (return . B.drop 1) enid
+        return $ NodeInfo (bs2id idbs) ip (fromIntegral (portnum :: Word16))
 
 getIP :: Word8 -> S.Get IP
 getIP 0x02 = IPv4 <$> S.get