diff --git a/lib/features/modeling/behavior/DropOnFlowBehavior.js b/lib/features/modeling/behavior/DropOnFlowBehavior.js
index f332f74a..28dcf38f 100644
--- a/lib/features/modeling/behavior/DropOnFlowBehavior.js
+++ b/lib/features/modeling/behavior/DropOnFlowBehavior.js
@@ -145,8 +145,7 @@ function DropOnFlow(eventBus, bpmnRules, modeling) {
     }
   }, true);
 
-
-  this.postExecute('shape.create', function(context) {
+  this.postExecuted('shape.create', function(context) {
 
     var shape = context.shape,
         targetFlow = context.targetFlow,
diff --git a/lib/features/modeling/behavior/LabelBehavior.js b/lib/features/modeling/behavior/LabelBehavior.js
index 892aa6c4..fbd1d9ba 100644
--- a/lib/features/modeling/behavior/LabelBehavior.js
+++ b/lib/features/modeling/behavior/LabelBehavior.js
@@ -47,7 +47,7 @@ function LabelSupport(eventBus, modeling, bpmnFactory) {
     var element = context.shape || context.connection,
         businessObject = element.businessObject;
 
-    if (!hasExternalLabel(businessObject)) {
+    if (!hasExternalLabel(element)) {
       return;
     }