diff --git a/src/routing/olsr/olsr-routing-protocol.cc b/src/routing/olsr/olsr-routing-protocol.cc
index 3ea0a686d..c7e57cc32 100644
--- a/src/routing/olsr/olsr-routing-protocol.cc
+++ b/src/routing/olsr/olsr-routing-protocol.cc
@@ -1412,8 +1412,12 @@ RoutingProtocol::ProcessHna (const olsr::MessageHeader &msg,
       //          A_time         =  current time + validity time
       else
         {
-          const AssociationTuple &assocTuple = (AssociationTuple){msg.GetOriginatorAddress(),it->address,it->mask,now + msg.GetVTime ()};
-          
+          AssociationTuple assocTuple = {
+            msg.GetOriginatorAddress(),
+            it->address,
+            it->mask,
+            now + msg.GetVTime ()
+          };
           AddAssociationTuple (assocTuple);
           
           //Schedule Association Tuple deletion