Fixes Demo issue

Fixes #134. Sorry I didn't make a topic branch.