Mailbox fix