Fix message propagation.