fixing messaging issue