Fix message analysis