Changed to java.util.HashSet