Fixing classmap