message issuses fixed