Fix bug 0 messages