#4137 Fix demo code