Fixing CRC