Proper fix for #944
Improve sample, enable protocol