Fixing another bug with classmap