- fixed classmaps