Fix to demo