diff --git a/liteeth/mac/crc.py b/liteeth/mac/crc.py
index 1a94bd1..9df44c5 100644
--- a/liteeth/mac/crc.py
+++ b/liteeth/mac/crc.py
@@ -121,22 +121,18 @@ def __init__(self, data_width):
         self.sync += reg.eq(engines[-1].crc_next)
 
         # Select CRC Engine/Result.
-        crc_next = Signal(self.width)
         for n in range(data_width//8):
+            crc_next = Signal(self.width)
             self.comb += [
                 engines[n].data.eq(self.data),
                 engines[n].crc_prev.eq(reg),
                 If(self.be[n],
-                    crc_next.eq(engines[n].crc_next)
+                    crc_next.eq(engines[n].crc_next),
+                    self.value.eq(engines[n].crc_next[::-1] ^ self.init),
+                    self.error.eq(engines[n].crc_next != self.check),
                 )
             ]
 
-        # Output.
-        self.comb += [
-            self.value.eq(crc_next[::-1] ^ self.init),
-            self.error.eq(crc_next != self.check),
-        ]
-
 # MAC CRC32 Inserter -------------------------------------------------------------------------------
 
 class LiteEthMACCRC32Inserter(LiteXModule):