fixing message bug