Fixing a bug on the demo