Possible fix to mismatched mailbox bug