Fix # demo-cm