Messaging bug fixed for initial versions