Fixed braking code in demo-branch