fixes map_fields behaviour