Fix message and add to list