diff --git a/src/main/java/noppes/npcs/controllers/ScriptContainer.java b/src/main/java/noppes/npcs/controllers/ScriptContainer.java
index 58fee0f2b..e5affe66b 100644
--- a/src/main/java/noppes/npcs/controllers/ScriptContainer.java
+++ b/src/main/java/noppes/npcs/controllers/ScriptContainer.java
@@ -228,6 +228,8 @@ public class ScriptContainer {
     }
 
     public boolean hasCode() {
+        if(!scripts.isEmpty())
+            return true;
         return !this.getFullCode().isEmpty();
     }
 
diff --git a/src/main/java/noppes/npcs/controllers/data/DataScript.java b/src/main/java/noppes/npcs/controllers/data/DataScript.java
index fac9d4c16..d1530f63d 100644
--- a/src/main/java/noppes/npcs/controllers/data/DataScript.java
+++ b/src/main/java/noppes/npcs/controllers/data/DataScript.java
@@ -117,7 +117,7 @@ public class DataScript implements INpcScriptHandler {
 		for (Map.Entry<EnumScriptType,ScriptContainer> entry : scripts.entrySet()) {
 			NBTTagCompound tagCompound = new NBTTagCompound();
 			ScriptContainer container = entry.getValue();
-			if (container.hasCode() || !container.scripts.isEmpty()) {
+			if (container.hasCode()) {
 				tagCompound.setInteger("Type", entry.getKey().ordinal());
 				container.writeToNBT(tagCompound);
 				list.appendTag(tagCompound);