diff --git a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
index c4ecdfd..bdc6d5e 100644
--- a/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
+++ b/pipelines/fabric/src/main/java/org/onosproject/pipelines/fabric/pipeliner/FabricForwardingPipeliner.java
@@ -19,7 +19,6 @@
 import com.google.common.collect.ImmutableSet;
 import org.onlab.packet.MacAddress;
 import org.onlab.packet.VlanId;
-import org.onlab.util.ImmutableByteSequence;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.flow.DefaultFlowRule;
 import org.onosproject.net.flow.DefaultTrafficSelector;
@@ -255,8 +254,7 @@
 
         treatment = fwd.treatment();
         if (fwd.nextId() != null) {
-            PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
-                                                          ImmutableByteSequence.copyFrom(fwd.nextId().byteValue()));
+            PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, fwd.nextId());
             PiAction nextIdAction = PiAction.builder()
                     .withId(FabricConstants.FABRIC_INGRESS_FORWARDING_POP_MPLS_AND_NEXT)
                     .withParameter(nextIdParam)
@@ -291,8 +289,7 @@
      * @return treatment with set_next_id action; empty treatment if next id is null
      */
     private static TrafficTreatment buildSetNextIdTreatment(Integer nextId, PiActionId actionId) {
-        PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID,
-                                                      ImmutableByteSequence.copyFrom(nextId.byteValue()));
+        PiActionParam nextIdParam = new PiActionParam(FabricConstants.NEXT_ID, nextId);
         PiAction nextIdAction = PiAction.builder()
                 .withId(actionId)
                 .withParameter(nextIdParam)
