Fixed the messaging system

Fixed #76