more demo 1 fix