Fix message duplication