1 files changed, 3 insertions, 3 deletions

diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs
index 21100c86..386c2766 100644
--- a/src/Network/Tox/Crypto/Transport.hs
+++ b/src/Network/Tox/Crypto/Transport.hs
@@ -420,7 +420,7 @@ class AsWord16 a where
    toWord16 :: a -> Word16
    fromWord16 :: Word16 -> a
 
-toEnum8 ::Enum a => Word8 -> a
+toEnum8 :: (Enum a, Integral word8) => word8 -> a
 toEnum8 = toEnum . fromIntegral
 fromEnum8 :: Enum a => a -> Word8
 fromEnum8 = fromIntegral . fromEnum
@@ -435,9 +435,9 @@ fromEnum16 = fromIntegral . fromEnum
 --      (at least one bit set in high byte means extended, if none but the g flag and possibly l flag, assume default grp extension)
 instance AsWord16 MessageType where
     toWord16 (Msg msgID) = fromIntegral (fromIntegral (fromEnum16 msgID) :: Word8)
-    toWord16 (GrpMsg lsy msgName) = 512 + 256 * (fromEnum16 lsy) + fromIntegral (fromIntegral (fromEnum msgName) :: Word8)
+    toWord16 (GrpMsg lsy msgName) = 512 + 256 * (fromEnum16 lsy) + fromIntegral (fromEnum8 msgName)
     fromWord16 x | x < 256                          = Msg (toEnum $ fromIntegral x)
-    fromWord16 x | x < 1024, x .|. 0x0200 == 0x0200 = GrpMsg (toEnum8 (fromIntegral ((x - 512) `div` 256))) (toEnum8 (fromIntegral x :: Word8))
+    fromWord16 x | x < 1024, x .|. 0x0200 == 0x0200 = GrpMsg (toEnum8 ((x - 512) `div` 256)) (toEnum8 x)
     fromWord16 x = error "Not clear how to convert Word16 to MessageType"
 
 word16 :: (Functor f, AsWord16 x) => (Word16 -> f Word16) -> (x -> f x)