Fixes #99
Repair message sending after fixing #127