fix up for demo by ieo