diff --git a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
index 4ac1607..137aca1 100644
--- a/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
+++ b/core/net/src/main/java/org/onosproject/net/flowobjective/impl/composition/FlowObjectiveCompositionUtil.java
@@ -28,6 +28,7 @@
 import org.onosproject.net.flow.criteria.VlanPcpCriterion;
 import org.onosproject.net.flow.criteria.MplsCriterion;
 import org.onosproject.net.flow.criteria.IPCriterion;
+import org.onosproject.net.flow.criteria.IPv6FlowLabelCriterion;
 import org.onosproject.net.flow.criteria.Criteria;
 import org.onosproject.net.flow.instructions.Instruction;
 import org.onosproject.net.flow.instructions.L0ModificationInstruction;
@@ -316,9 +317,8 @@
                             }
                         case IPV6_FLABEL:
                             if (criterionMap.containsKey(Criterion.Type.IPV6_FLABEL)) {
-                                if (((IPCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).ip()
-                                        .equals(((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3)
-                                                .flowLabel())) {
+                                if (((IPv6FlowLabelCriterion) criterionMap.get(Criterion.Type.IPV6_FLABEL)).flowLabel()
+                                        == (((L3ModificationInstruction.ModIPv6FlowLabelInstruction) l3).flowLabel())) {
                                     criterionMap.remove(Criterion.Type.IPV4_SRC);
                                 } else {
                                     return null;
