fixed the message issues