Fix message handling for async additions