Fix the demo as well