fixing message issues