--- a/src/internet/model/ipv6-l3-protocol.cc	Tue Jul 16 07:34:15 2013 -0700
+++ b/src/internet/model/ipv6-l3-protocol.cc	Wed Jul 17 23:34:17 2013 +0200
@@ -266,17 +266,17 @@
   if (flags & (1 << 6)) /* auto flag */
     {
       // In case of new MacAddress types, remember to change Ipv6L3Protocol::RemoveAutoconfiguredAddress as well
-      if (Mac16Address::IsMatchingType (addr))
+      if (Mac64Address::IsMatchingType (addr))
         {
-          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network));
+          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network));
         }
       else if (Mac48Address::IsMatchingType (addr))
         {
           address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network));
         }
-      else if (Mac64Address::IsMatchingType (addr))
+      else if (Mac16Address::IsMatchingType (addr))
         {
-          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network));
+          address = Ipv6InterfaceAddress (Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network));
         }
       else
         {
@@ -324,17 +324,17 @@
   uint32_t i = 0;
   Ipv6Address toFound;
 
-  if (Mac16Address::IsMatchingType (addr))
+  if (Mac64Address::IsMatchingType (addr))
     {
-      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network);
+      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network);
     }
   else if (Mac48Address::IsMatchingType (addr))
     {
       toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac48Address::ConvertFrom (addr), network);
     }
-  else if (Mac64Address::IsMatchingType (addr))
+  else if (Mac16Address::IsMatchingType (addr))
     {
-      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac64Address::ConvertFrom (addr), network);
+      toFound = Ipv6Address::MakeAutoconfiguredAddress (Mac16Address::ConvertFrom (addr), network);
     }
   else
     {