fixing issue with messages