class map fix