Fix bug with second word of message being dropped