Fixing demo creation