Switch from Set to List.distinct