diff --git a/checks/drc_checks/magic/magic_drc_check.tcl b/checks/drc_checks/magic/magic_drc_check.tcl
index 2753614..84c2268 100644
--- a/checks/drc_checks/magic/magic_drc_check.tcl
+++ b/checks/drc_checks/magic/magic_drc_check.tcl
@@ -14,15 +14,15 @@
 # SPDX-License-Identifier: Apache-2.0
 
 
-set GDS_UT_PATH [lindex $argv 6]
-set DESIGN_NAME [lindex $argv 7]
-set PDK_PATH [lindex $argv 8]
-set DRC_REPORT [lindex $argv 9]
-set DRC_MAG [lindex $argv 10]
-set SRAM_MODULES [lindex $argv 11]
-set ESD_FET [lindex $argv 12]
-set HAS_SRAM [lindex $argv 13]
-set HAS_ESD_FET [lindex $argv 14]
+set GDS_UT_PATH [lindex $argv end-8]
+set DESIGN_NAME [lindex $argv end-7]
+set PDK_PATH [lindex $argv end-6]
+set DRC_REPORT [lindex $argv end-5]
+set DRC_MAG [lindex $argv end-4]
+set SRAM_MODULES [lindex $argv end-3]
+set ESD_FET [lindex $argv end-2]
+set HAS_SRAM [lindex $argv end-1]
+set HAS_ESD_FET [lindex $argv end]
 
 if { $HAS_ESD_FET } {
     gds noduplicates yes
@@ -90,4 +90,4 @@ puts stdout "\[INFO\]: Saving mag view with DRC errors($DRC_MAG)"
 save $DRC_MAG
 puts stdout "\[INFO\]: Saved"
 
-exit $count
\ No newline at end of file
+exit $count
diff --git a/checks/xor_check/erase_box.tcl b/checks/xor_check/erase_box.tcl
index 28ff509..ef30da8 100644
--- a/checks/xor_check/erase_box.tcl
+++ b/checks/xor_check/erase_box.tcl
@@ -1,7 +1,7 @@
 drc off
-set gds_input [lindex $argv 6]
-set out_file [lindex $argv 7]
-set cell_name [lindex $argv 8]
+set gds_input [lindex $argv end-2]
+set out_file [lindex $argv end-1]
+set cell_name [lindex $argv end]
 undo disable
 tech unlock *
 cif istyle sky130(vendor)
diff --git a/checks/xor_check/erase_box_gf180mcu.tcl b/checks/xor_check/erase_box_gf180mcu.tcl
index 5df50ca..b959151 100644
--- a/checks/xor_check/erase_box_gf180mcu.tcl
+++ b/checks/xor_check/erase_box_gf180mcu.tcl
@@ -1,7 +1,7 @@
 drc off
-set gds_input [lindex $argv 6]
-set out_file [lindex $argv 7]
-set cell_name [lindex $argv 8]
+set gds_input [lindex $argv end-2]
+set out_file [lindex $argv end-1]
+set cell_name [lindex $argv end]
 undo disable
 tech unlock *
 cif istyle sky130(vendor)