diff --git a/lib/SNMP/Info/Layer3/Eltex.pm b/lib/SNMP/Info/Layer3/Eltex.pm
index acf56bee..afd187f8 100644
--- a/lib/SNMP/Info/Layer3/Eltex.pm
+++ b/lib/SNMP/Info/Layer3/Eltex.pm
@@ -17,22 +17,22 @@ our ( $VERSION, %GLOBALS, %FUNCS, %MIBS, %MUNGE );
 
 $VERSION = '3.70-135';
 
-our $index = undef;
+#our $index = undef;
 
 %MIBS = ( %SNMP::Info::Layer3::MIBS, );
 
 %GLOBALS = (
     %SNMP::Info::Layer3::GLOBALS,
-    'model_oid_mes'   => 'mib-2.47.1.1.1.1.13.67108992',
-    'hw_oid_1_81'          => 'mib-2.47.1.1.1.1.8.67108992',
-    'model_oid'       => 'iso.0.8802.1.1.2.1.3.4.0',
-    'model_oid_mxa'   => 'enterprises.35265.4.2.0',
-    'hw_oid'          => 'iso.0.8802.1.1.2.1.5.4795.1.2.2.0',
-    'hw_oid_1_30'     => 'iso.0.8802.1.1.2.1.5.1.1.2.2.0',
-    'serial_oid'      => 'mib-2.47.1.1.1.1.11.67108992',
-    'serial_oid_22'   => 'enterprises.35265.1.22.1.18.4.0',
+    'model_oid_mes'  => 'mib-2.47.1.1.1.1.13.67108992',
+    'hw_oid_1_81'    => 'mib-2.47.1.1.1.1.8.67108992',
+    'model_oid'      => 'iso.0.8802.1.1.2.1.3.4.0',
+    'model_oid_mxa'  => 'enterprises.35265.4.2.0',
+    'hw_oid'         => 'iso.0.8802.1.1.2.1.5.4795.1.2.2.0',
+    'hw_oid_1_30'    => 'iso.0.8802.1.1.2.1.5.1.1.2.2.0',
+    'serial_oid'     => 'mib-2.47.1.1.1.1.11.67108992',
+    'serial_oid_22'  => 'enterprises.35265.1.22.1.18.4.0',
     'serial_oid_mxa' => 'enterprises.35265.4.3.0',
-    'os_ver_oid'      => 'mib-2.47.1.1.1.1.10.67108992',
+    'os_ver_oid'     => 'mib-2.47.1.1.1.1.10.67108992',
     'os_ver_oid_mxa' => 'enterprises.35265.4.5.0',
     'bootrom_oid'    => 'mib-2.47.1.1.1.1.9.67108992',
     #'serial_oid_140'  => '',
@@ -91,19 +91,19 @@ sub os_ver {
         $os_ver = $obj->os_ver_oid_140;
         return $os_ver;
     }
-    if ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
+    if ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28$/) {
         return $obj->os_ver_oid_mxa;
     }
     elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9])$/) {
         $os_ver = $obj->os_ver_oid;
         $bootrom = $obj->bootrom_oid;
     }
-    elsif ( $id =~ /35265\.1\.22/ ) {
+    elsif ( $id =~ /35265\.1\.22$/ ) {
         my $descr = $obj->descr_oid;
         $descr =~ /Eltex\s(.*)\ssoftware\sversion\s(.*)\sbuild\s(\d+)/;
         return $2;
     }
-    elsif ($id =~ /35265\.1\.30/) {
+    elsif ($id =~ /35265\.1\.30$/) {
 
     }
     else {
@@ -119,13 +119,13 @@ sub serial {
     if ($id =~ /35265\.(140|158)$/) {
         return;
     }
-    elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28/) {
+    elsif ($id =~ /34300\.1\.6/ or $id =~ /35265\.1\.28$/) {
         return $obj->serial_oid_mxa;
     }
     elsif ($id =~ /35265\.1\.(24|43|30|120|5[2,4]|74|8[1,9]])$/) {
         $serial = $obj->serial_oid;
     }
-    elsif ( $id =~ /35265\.1\.22/ ) {
+    elsif ( $id =~ /35265\.1\.22$/ ) {
         $serial = $obj->serial_oid_22;
     }
     else {
@@ -137,15 +137,14 @@ sub serial {
 sub hwver {
     my $obj = shift;
     my $id = $obj->id();
-    my $hw = $obj->hw_ver();
-    if ($id =~ /35265\.1\.30/) {
+    if ($id =~ /35265\.1\.30$/) {
         return $obj->hw_oid_1_30;
     }
-    elsif($id =~ /35265\.1\.81|5[4,2]/) {
+    elsif($id =~ /35265\.1\.(8[1,9]|5[4,2]|43)$/) {
         return $obj->hw_oid_1_81;
     }
-    else {
-        return $hw;
+    elsif($id =~ /35265\.158/) {
+        return $obj->hw_oid;
     }
 }