Classmap fixing