Bugfix on demo app