Bug fix in demo