Fix message sending. Closes #116