Fix CRC hopefully for the last time.