Fix mailbox bug