diff --git a/src/bootsupport/modules/punkcheck-0.1.0.tm b/src/bootsupport/modules/punkcheck-0.1.0.tm
index 746b8053..31403512 100644
--- a/src/bootsupport/modules/punkcheck-0.1.0.tm
+++ b/src/bootsupport/modules/punkcheck-0.1.0.tm
@@ -303,10 +303,13 @@ namespace eval punkcheck {
 
                     set o_targets [lsort -dictionary -increasing $relativepath_targetset] ;#exact sort order not critical - but must be consistent
 
-                    #load as dict to test for dupes
-                    set targetdict [my targetset_dict]
 
                     set record_list [punkcheck::load_records_from_file $punkcheck_file]
+
+                    #load as dict to test for dupes
+                    #set targetdict [my targetset_dict]
+                    set targetdict [punkcheck::recordlist::records_as_target_dict $record_list]
+
                     set extractioninfo [punkcheck::recordlist::extract_or_create_fileset_record $o_targets $record_list]
                     set o_fileset_record [dict get $extractioninfo record]
                     set record_list [dict get $extractioninfo recordset]
diff --git a/src/modules/punkcheck-0.1.0.tm b/src/modules/punkcheck-0.1.0.tm
index 746b8053..31403512 100644
--- a/src/modules/punkcheck-0.1.0.tm
+++ b/src/modules/punkcheck-0.1.0.tm
@@ -303,10 +303,13 @@ namespace eval punkcheck {
 
                     set o_targets [lsort -dictionary -increasing $relativepath_targetset] ;#exact sort order not critical - but must be consistent
 
-                    #load as dict to test for dupes
-                    set targetdict [my targetset_dict]
 
                     set record_list [punkcheck::load_records_from_file $punkcheck_file]
+
+                    #load as dict to test for dupes
+                    #set targetdict [my targetset_dict]
+                    set targetdict [punkcheck::recordlist::records_as_target_dict $record_list]
+
                     set extractioninfo [punkcheck::recordlist::extract_or_create_fileset_record $o_targets $record_list]
                     set o_fileset_record [dict get $extractioninfo record]
                     set record_list [dict get $extractioninfo recordset]