Fix bug which caused us to lose most of a message.