Changed HashSet to LinkedHashSet