fix Demo after recent bugfixes