diff --git a/ChangeLog b/ChangeLog
index b5ccb547..c9710369 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ version 3.14 ()
    [ENHANCEMENTS]
 
     * Improvements to Mikrotik module (Alex Z)
+    * Don't unshift length from broken lldpRemManAddrTable implementations (G. Shtern)
 
 version 3.13 (2014-03-27)
 
diff --git a/Info/LLDP.pm b/Info/LLDP.pm
index c872aefc..0f4d7855 100644
--- a/Info/LLDP.pm
+++ b/Info/LLDP.pm
@@ -298,7 +298,7 @@ sub _lldp_addr_index {
     my @oids   = split( /\./, $idx );
     my $index  = join( '.', splice( @oids, 0, 3 ) );
     my $proto  = shift(@oids);
-    my $length = shift(@oids);
+    my $length = shift(@oids) if scalar @oids > 4;
 
     # IPv4
     if ( $proto == 1 ) {