Fixes message sending