Bug fix on Demoer.