fix for BPMN-56
fix BPMN 60
fix for BPMN-58
fix for BPMN-58