Fix to ignore order of records by using a Set