Demo App fix