Fixed removal of map_type lookup