DEMO-7 fixed issue