JH - fixed a messaging bug