fix for class map