Bug fix in demo app