DEMO-41 fixed