fixed the previous fix of Messages