fix the messages