diff --git a/scripts/magic.tcl b/scripts/magic.tcl
index 6ba329d..be70566 100644
--- a/scripts/magic.tcl
+++ b/scripts/magic.tcl
@@ -60,10 +60,14 @@
 puts "saved box values: [box values]"
 
 # Write gds
+cellname rename $::env(magic_result_file_tag) $::env(DESIGN_NAME)
 if { $::env(MAGIC_GENERATE_GDS) } {
 	cif *hier write disable
-	gds write $::env(magic_result_file_tag).gds
+	#gds write $::env(magic_result_file_tag).gds
+	cd $::env(RUN_DIR)/results/magic/
+	gds write $::env(DESIGN_NAME).gds
 	puts "GDS write complete"
+	cd $::env(OPENLANE_ROOT)
 }
 
 if { $::env(MAGIC_GENERATE_LEF) } {