diff --git a/desktop_version/src/Script.cpp b/desktop_version/src/Script.cpp
index c5c35e84..6c9a294c 100644
--- a/desktop_version/src/Script.cpp
+++ b/desktop_version/src/Script.cpp
@@ -38,6 +38,8 @@ void scriptclass::clearcustom(void)
 	customscripts.clear();
 }
 
+static bool argexists[NUM_SCRIPT_ARGS];
+
 void scriptclass::tokenize( const std::string& t )
 {
 	j = 0;
@@ -71,9 +73,15 @@ void scriptclass::tokenize( const std::string& t )
 		}
 	}
 
-	if (tempword != "" && j < (int) SDL_arraysize(words))
+	SDL_zeroa(argexists);
+
+	if (j < (int) NUM_SCRIPT_ARGS)
 	{
-		words[j] = tempword;
+		argexists[j] = tempword != "";
+		if (argexists[j])
+		{
+			words[j] = tempword;
+		}
 	}
 }
 
@@ -756,10 +764,10 @@ void scriptclass::run(void)
 				std::string word7 = words[7];
 				std::string word8 = words[8];
 				std::string word9 = words[9];
-				if (words[6] == "") words[6] = "0";
-				if (words[7] == "") words[7] = "0";
-				if (words[8] == "") words[8] = "320";
-				if (words[9] == "") words[9] = "240";
+				if (!argexists[6]) words[6] = "0";
+				if (!argexists[7]) words[7] = "0";
+				if (!argexists[8]) words[8] = "320";
+				if (!argexists[9]) words[9] = "240";
 				obj.createentity(
 					ss_toi(words[1]),
 					ss_toi(words[2]),
diff --git a/desktop_version/src/Script.h b/desktop_version/src/Script.h
index 89fc6993..1377fd99 100644
--- a/desktop_version/src/Script.h
+++ b/desktop_version/src/Script.h
@@ -15,6 +15,8 @@ struct Script
     std::vector<std::string> contents;
 };
 
+#define NUM_SCRIPT_ARGS 40
+
 class scriptclass
 {
 public:
@@ -47,7 +49,7 @@ public:
 
     //Script contents
     std::vector<std::string> commands;
-    std::string words[40];
+    std::string words[NUM_SCRIPT_ARGS];
     std::vector<std::string> txt;
     std::string scriptname;
     int position;