diff --git a/code/controllers/subsystem/processing/SSstation.dm b/code/controllers/subsystem/processing/SSstation.dm
index 73fe2a6f2364..64a285813d33 100644
--- a/code/controllers/subsystem/processing/SSstation.dm
+++ b/code/controllers/subsystem/processing/SSstation.dm
@@ -18,9 +18,9 @@ PROCESSING_SUBSYSTEM_DEF(station)
 /datum/controller/subsystem/processing/station/proc/SetupTraits()
 
 	if(fexists("data/next_traits.txt"))
-		var/forced_traits_contents = file2list("data/next_traits.txt")
+		var/forced_traits_contents = file2text("data/next_traits.txt")
 		fdel("data/next_traits.txt")
-		var/list/temp_list = splittext(forced_traits_contents[1], ",")
+		var/list/temp_list = json_decode(forced_traits_contents)
 
 		for(var/trait_text_path in temp_list)
 			var/station_trait_path = text2path(trait_text_path)
diff --git a/code/datums/station_traits/admin_panel.dm b/code/datums/station_traits/admin_panel.dm
index 9e088d8ea610..6c11de92f122 100644
--- a/code/datums/station_traits/admin_panel.dm
+++ b/code/datums/station_traits/admin_panel.dm
@@ -101,7 +101,7 @@
 			future_traits = new_future_traits
 			fdel("data/next_traits.txt") //Delete it.
 			var/F = file("data/next_traits.txt")
-			F << params["station_traits"]
+			F << json_encode(params["station_traits"])
 			return TRUE
 
 		if("clear_future_traits")