Bug fix.
Remove unnecessary crc check
Bug fix
Improve ClassComparator