todo
Bugfix. That broke onstage shell.