fixing messaging bug