bugfixing for demo