List as a value within in Map was not converted properly. Fixed