Fixing demo application