diff --git a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
index 969b2b7..a2a8e48 100644
--- a/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
+++ b/src/main/java/net/onrc/onos/apps/forwarding/Forwarding.java
@@ -331,7 +331,7 @@
 
         //This code assumes the host has only one port. It should be problem.
         Port destinationPort = ports.next();
-        short destinationPortNum = destinationPort.getNumber().value();
+        short destinationPortNum = destinationPort.getNumber().shortValue();
         Switch destinationSw = destinationPort.getSwitch();
         long destinationDpid = destinationSw.getDpid().value();
 
@@ -525,7 +525,7 @@
             outPort = (short) spfIntent.getDstPortNumber();
             log.debug("Path is empty. Maybe hosts on the same switch. outPort {}", outPort);
         } else {
-            outPort = graphPath.get(0).getSrc().getPortNumber().value();
+            outPort = graphPath.get(0).getSrc().getPortNumber().shortValue();
             log.debug("path{}, outPort {}", graphPath, outPort);
         }
 
