Fixed bug in Demo App