Fix the messages not being correct.