diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar
index 5554c798..a00927c6 100644
Binary files a/tools/model_generator/genmodel.jar and b/tools/model_generator/genmodel.jar differ
diff --git a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
index 4efc1e38..1d4fb21a 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/DataModelValue.java
@@ -86,7 +86,7 @@ public class DataModelValue {
         	if (trimmedValue.isEmpty())
         		this.value = new Long(0);
         	else
-        		this.value = Long.decode(trimmedValue);
+        		this.value = Long.parseLong(trimmedValue);
             break;
         case BOOLEAN: