See #98: Updated demo with fix #98.