type mapping corrected