diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
index 3cdfa42..b412cdb 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/DefaultLispMapReply.java
@@ -232,6 +232,7 @@
                         .withIsEtr(etr)
                         .withIsSecurity(security)
                         .withNonce(nonce)
+                        .withMapRecords(mapRecords)
                         .build();
         }
     }
diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
index 9ceef6c..e4ea7db 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/protocols/LispEidRecord.java
@@ -77,7 +77,8 @@
             // let's skip the reserved field
             byteBuf.skipBytes(RESERVED_SKIP_LENGTH);
 
-            short maskLength = (short) byteBuf.readUnsignedShort();
+            // mask length -> 8 bits
+            short maskLength = byteBuf.readUnsignedByte();
 
             LispAfiAddress prefix = new LispAfiAddress.AfiAddressReader().readFrom(byteBuf);