fixed messages issues