Fix message spreading