Fixing another ClassClassException