Bugfix on demo