diff --git a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
index 53d0528..500ac1c 100644
--- a/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
+++ b/core/api/src/main/java/org/onosproject/net/flow/instructions/Instructions.java
@@ -352,7 +352,7 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(type());
+            return Objects.hash(type().ordinal());
         }
 
         @Override
@@ -393,7 +393,7 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(type(), port);
+            return Objects.hash(type().ordinal(), port);
         }
 
         @Override
@@ -437,7 +437,7 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(type(), groupId);
+            return Objects.hash(type().ordinal(), groupId);
         }
 
         @Override
@@ -481,7 +481,7 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(type(), tableId);
+            return Objects.hash(type().ordinal(), tableId);
         }
 
         @Override
@@ -533,7 +533,7 @@
 
         @Override
         public int hashCode() {
-            return Objects.hash(type(), metadata, metadataMask);
+            return Objects.hash(type().ordinal(), metadata, metadataMask);
         }
 
         @Override
