Fix bug with direction-less message