Fix CRC16 again