Fixed issue with map types drawing incorrectly