diff --git a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
index c51a8aa..170737c 100644
--- a/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
+++ b/protocols/lisp/msg/src/main/java/org/onosproject/lisp/msg/types/LispListLcafAddress.java
@@ -30,8 +30,8 @@
 /**
  * List type LCAF address class.
  * <p>
- * List type is defined in draft-ietf-lisp-lcaf-13
- * https://tools.ietf.org/html/draft-ietf-lisp-lcaf-13#page-21
+ * List type is defined in draft-ietf-lisp-lcaf-20
+ * https://tools.ietf.org/html/draft-ietf-lisp-lcaf-20#page-22
  *
  * <pre>
  * {@literal
@@ -40,7 +40,7 @@
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * |           AFI = 16387         |     Rsvd1     |     Flags     |
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- * |   Type = 1    |     Rsvd2     |         2 + 4 + 2 + 16        |
+ * |   Type = 1    |     Rsvd2     |            Length             |
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
  * |            AFI = 1            |       IPv4 Address ...        |
  * +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
@@ -79,7 +79,7 @@
      * Initializes list type LCAF address.
      *
      * @param reserved1 reserved1 field
-     * @param flag flag
+     * @param flag      flag
      * @param reserved2 reserved2 field
      * @param addresses a set of IPv4 and IPv6 addresses
      */
@@ -171,7 +171,7 @@
             LispAfiAddress ipv6 = reader.readFrom(byteBuf);
 
             return new LispListLcafAddress(lcafAddress.getReserved1(), lcafAddress.getReserved2(),
-                                           lcafAddress.getFlag(), ImmutableList.of(ipv4, ipv6));
+                    lcafAddress.getFlag(), ImmutableList.of(ipv4, ipv6));
         }
     }
 
