Fix message acknowledgement