Messaging bug fix