Fixed the message sending issues