fixed messages again