Hopefully correct bug in demo