fixed problems when adding mappings to the result