Fixing review issue with swapped dictionary definitions