DEMO-13 #resolve