diff --git a/src/dhcp6.c b/src/dhcp6.c
index 9db87d3..1428aa6 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -569,11 +569,11 @@ void dhcp_construct_contexts(time_t now)
   param.now = now;
 
   for (context = daemon->dhcp6; context; context = context->next)
-    if (context->flags & CONTEXT_CONSTRUCTED)
-      {
-	context->flags |= CONTEXT_GC;
-	context->if_index = 0;
-      }
+    {
+      context->if_index = 0;
+      if (context->flags & CONTEXT_CONSTRUCTED)
+      	context->flags |= CONTEXT_GC;
+    }
  
   iface_enumerate(AF_INET6, &param, construct_worker);