BHV-5139: adding sample, fixing bug