fixed classmap issue