diff --git a/aos/linux_code/queue-tmpl.h b/aos/linux_code/queue-tmpl.h
index 25eb8d9..1362515 100644
--- a/aos/linux_code/queue-tmpl.h
+++ b/aos/linux_code/queue-tmpl.h
@@ -102,6 +102,7 @@
 T *Queue<T>::MakeRawMessage() {
   T *ret = static_cast<T *>(queue_->GetMessage());
   assert(ret != NULL);
+  ret->Zero();
   return ret;
 }
 
@@ -109,7 +110,6 @@
 aos::MessageBuilder<T> Queue<T>::MakeWithBuilder() {
   Init();
   T *const ret = MakeRawMessage();
-  ret->Zero();
   return aos::MessageBuilder<T>(queue_, ret);
 }