diff --git a/ChangeLog b/ChangeLog
index 05661bab..1c2445a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@ version 3.24
    [BUG FIXES]
 
     * Fix single instance leafs defined in %FUNCS to behave like table leafs
+    * Fix incorrect FDB ID to VLAN ID mapping in Bridge and L3:Enterasys
 
 version 3.23 (2014-12-09)
 
diff --git a/Info/Bridge.pm b/Info/Bridge.pm
index 39ff3cd9..a84c211b 100644
--- a/Info/Bridge.pm
+++ b/Info/Bridge.pm
@@ -224,9 +224,9 @@ sub qb_fdb_index {
 
     # Strip the TimeFilter
     my $vl_fdb_index = {};
-    for my $orig (keys(%$qb_fdb_ids)) {
-        (my $new = $orig) =~ s/^\d+\.//;
-        $vl_fdb_index->{$new} = $qb_fdb_ids->{$orig};
+    for my $fdb_entry (keys(%$qb_fdb_ids)) {
+        (my $vlan = $fdb_entry) =~ s/^\d+\.//;
+        $vl_fdb_index->{$qb_fdb_ids->{$fdb_entry}} = $vlan;
     }
 
     return $vl_fdb_index;
diff --git a/Info/Layer3/Enterasys.pm b/Info/Layer3/Enterasys.pm
index 894e6370..afb47454 100644
--- a/Info/Layer3/Enterasys.pm
+++ b/Info/Layer3/Enterasys.pm
@@ -163,9 +163,9 @@ sub qb_fdb_index {
 
     # Strip the TimeFilter
     my $vl_fdb_index = {};
-    for my $orig (keys(%$qb_fdb_ids)) {
-        (my $new = $orig) =~ s/^\d+\.//;
-        $vl_fdb_index->{$new} = $qb_fdb_ids->{$orig};
+    for my $fdb_entry (keys(%$qb_fdb_ids)) {
+        (my $vlan = $fdb_entry) =~ s/^\d+\.//;
+        $vl_fdb_index->{$qb_fdb_ids->{$fdb_entry}} = $vlan;
     }
 
     return $vl_fdb_index;