diff --git a/tools/model_generator/genconfig.jar b/tools/model_generator/genconfig.jar
index 191c492..1c00bf0 100644
Binary files a/tools/model_generator/genconfig.jar and b/tools/model_generator/genconfig.jar differ
diff --git a/tools/model_generator/genmodel.jar b/tools/model_generator/genmodel.jar
index 594ae74..2f84d3f 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/communication/GSEAddress.java b/tools/model_generator/src/com/libiec61850/scl/communication/GSEAddress.java
index cc1d611..151033e 100644
--- a/tools/model_generator/src/com/libiec61850/scl/communication/GSEAddress.java
+++ b/tools/model_generator/src/com/libiec61850/scl/communication/GSEAddress.java
@@ -55,7 +55,7 @@ public class GSEAddress {
            else if (type.equals("APPID")) {
                appId = Integer.parseInt(pNode.getTextContent(), 16);
                
-               if (appId > 0xfff)
+               if (appId > 0xffff)
             	   throw new SclParserException(addressNode, "APPID value out of range");
            }
            else if (type.equals("MAC-Address")) {