make it work with latest crc