Changed toMap called from last commit