diff --git a/doc/Changelog b/doc/Changelog
index 111e720e7..542a57174 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+5 Nov 2013: Wouter
+	- Patch from Neel Goyal to fix async id assignment if callback
+	  is called by libunbound in the mesh attach.
+
 4 Nov 2013: Wouter
 	- Patch from Neel Goyal to fix callback in libunbound.
 
diff --git a/libunbound/libworker.c b/libunbound/libworker.c
index a855b7968..74a6476e3 100644
--- a/libunbound/libworker.c
+++ b/libunbound/libworker.c
@@ -679,14 +679,14 @@ int libworker_attach_mesh(struct ub_ctx* ctx, struct ctx_query* q,
 		return UB_NOERROR;
 	}
 	/* process new query */
+	if(async_id)
+		*async_id = q->querynum;
 	if(!mesh_new_callback(w->env->mesh, &qinfo, qflags, &edns, 
 		w->back->udp_buff, qid, libworker_event_done_cb, q)) {
 		free(qinfo.qname);
 		return UB_NOMEM;
 	}
 	free(qinfo.qname);
-	if(async_id)
-		*async_id = q->querynum;
 	return UB_NOERROR;
 }