DEMO-2 issue fixed