fixed bug in list mapping and in map mapping