Fixed the unnecessary call to buildDictionary in the map