avoid mailbox congestion, small hack + packages fix