fixed classmap