Fixed map type detecting from dict to collections.Mapping