classmap fix