#94 return value toMap bug