fixed messages AGAIN