Issue #15: fix demo