fix for mappings where key and name of field differ