demo-specific bugfix