Use correct location for HashSet