Fixed bug with demo