diff --git a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
index 4f57bd3..d2b43b3 100644
--- a/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
+++ b/apps/grouphandler/src/main/java/org/onosproject/grouphandler/PolicyGroupHandler.java
@@ -23,6 +23,7 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.onlab.packet.MplsLabel;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.GroupId;
 import org.onosproject.grouphandler.GroupBucketIdentifier.BucketOutputType;
@@ -111,7 +112,7 @@
                                                getDeviceMac(neighbor))
                                     .setEthSrc(nodeMacAddr)
                                     .pushMpls()
-                                    .setMpls(label);
+                                    .setMpls(MplsLabel.mplsLabel(label));
                             outBuckets.add(DefaultGroupBucket.
                                            createSelectGroupBucket(tBuilder.build()));
                             GroupDescription desc = new
@@ -176,7 +177,7 @@
                                        getDeviceMac(neighbor))
                             .setEthSrc(nodeMacAddr)
                             .pushMpls()
-                            .setMpls(bucketId.label());
+                            .setMpls(MplsLabel.mplsLabel(bucketId.label()));
                     //TODO: BoS
                     outBuckets.add(DefaultGroupBucket.
                                    createSelectGroupBucket(tBuilder.build()));
@@ -217,7 +218,7 @@
                         TrafficTreatment.Builder tBuilder =
                                 DefaultTrafficTreatment.builder();
                         tBuilder.pushMpls()
-                                .setMpls(bucketId.label());
+                                .setMpls(MplsLabel.mplsLabel(bucketId.label()));
                         //TODO: BoS
                         if (bucketId.type() == BucketOutputType.PORT) {
                             DeviceId neighbor = portDeviceMap.
