diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/build.properties b/edexOsgi/com.raytheon.edex.plugin.gfe/build.properties
index ad8d78badb..548582a528 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/build.properties
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                res/,\
-               resources/
+               resources/,\
+               utility/
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
index 8344ad12ae..d71d0e3e7f 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
@@ -197,9 +197,9 @@ public final class TPCWatchSrv extends AbstractWatchNotifierSrv {
         // if we are not in practice mode
         if (!practiceMode) {
 
-            // if xxxId ends with a digit (i.e. its a national TCV)
+            // if xxxId does NOT end with a digit (i.e. its NOT a national TCV)
             String xxxId = record.getXxxid();
-            if (Character.isDigit(xxxId.charAt(xxxId.length() - 1))) {
+            if (!Character.isDigit(xxxId.charAt(xxxId.length() - 1))) {
 
                 // build the full 9-letter PIL
                 String fullPil = SiteMap.getInstance().mapICAOToCCC(