fixed the messages