fix messaging bug