diff --git a/src/translation.cc b/src/translation.cc
index 55daa4c..88f0a03 100644
--- a/src/translation.cc
+++ b/src/translation.cc
@@ -2,10 +2,10 @@
 
 int interface_key_to_port_no(bcmbal_interface_key key) {
     if (key.intf_type == BCMBAL_INTF_TYPE_NNI) {
-        return 128 + key.intf_id;
+        return (0x1 << 15) + key.intf_id;
     }
     if (key.intf_type == BCMBAL_INTF_TYPE_PON) {
-        return (0x2 << 28) + 1;
+        return (0x2 << 28) + key.intf_id;
     }
     return key.intf_id;
 }