diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
index 12775076..9bcd6233 100644
--- a/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
+++ b/BauSystem_Main/src/de/steamwar/bausystem/features/script/ScriptExecutor.java
@@ -152,18 +152,22 @@ public final class ScriptExecutor {
         variables.addAll(Constants.allVariables());
         variables.addAll(globalVariables.allVariables());
 
-        for (int i = 0; i < 2; i++) {
+        for (int i = 0; i < 3; i++) {
             for (String variable : variables) {
-                s = s.replace("<" + variable + ">", getValue(variable) + "");
+                s = s.replace("<" + variable + ">", getValue(variable));
+                s = s.replace("<" + variable + ".type>", getOrItselfValue(variable).type());
             }
             for (String constVariable : Constants.allVariables()) {
-                s = s.replace("<const." + constVariable + ">", getConstant(constVariable) + "");
+                s = s.replace("<const." + constVariable + ">", getConstant(constVariable));
+                s = s.replace("<const." + constVariable + ".type>", Constants.getConstant(constVariable, player).type());
             }
             for (String localVariable : localVariables.allVariables()) {
-                s = s.replace("<local." + localVariable + ">", getLocal(localVariable) + "");
+                s = s.replace("<local." + localVariable + ">", getLocal(localVariable));
+                s = s.replace("<local." + localVariable + ".type>", getLocalVariables().getValue(localVariable).type());
             }
             for (String globalVariable : globalVariables.allVariables()) {
-                s = s.replace("<global." + globalVariable + ">", getGlobal(globalVariable) + "");
+                s = s.replace("<global." + globalVariable + ">", getGlobal(globalVariable));
+                s = s.replace("<global." + globalVariable + ".type>", globalVariables.getValue(globalVariable).type());
             }
         }
         return s.split(" ");
@@ -220,7 +224,7 @@ public final class ScriptExecutor {
         if (localVariables.hasValue(variable)) {
             return localVariables.getValue(variable).asString();
         }
-        return "0";
+        return "";
     }
 
     public String getConstant(String variable) {