diff --git a/Composer/packages/extensions/visual-designer/src/transformers/transformForeach.ts b/Composer/packages/extensions/visual-designer/src/transformers/transformForeach.ts
index f8fa634bb8..c9df80d61f 100644
--- a/Composer/packages/extensions/visual-designer/src/transformers/transformForeach.ts
+++ b/Composer/packages/extensions/visual-designer/src/transformers/transformForeach.ts
@@ -27,7 +27,7 @@ export function transformForeach(
   return {
     foreachDetail: foreachDetailNode,
     stepGroup: stepsNode,
-    loopBegin: new IndexedNode(`${jsonpath}.begin`, { $type: ObiTypes.LoopIndicator }),
-    loopEnd: new IndexedNode(`${jsonpath}.end`, { $type: ObiTypes.LoopIndicator }),
+    loopBegin: new IndexedNode(jsonpath, { $type: ObiTypes.LoopIndicator }),
+    loopEnd: new IndexedNode(jsonpath, { $type: ObiTypes.LoopIndicator }),
   };
 }
diff --git a/Composer/packages/extensions/visual-designer/src/transformers/transformIfCondition.ts b/Composer/packages/extensions/visual-designer/src/transformers/transformIfCondition.ts
index e9cc1ae6d7..4bb35f323b 100644
--- a/Composer/packages/extensions/visual-designer/src/transformers/transformIfCondition.ts
+++ b/Composer/packages/extensions/visual-designer/src/transformers/transformIfCondition.ts
@@ -19,7 +19,7 @@ export function transformIfCondtion(
       ...input,
       $type: ObiTypes.ConditionNode,
     }),
-    choice: new IndexedNode(`${jsonpath}.choice`, {
+    choice: new IndexedNode(`${jsonpath}`, {
       $type: ObiTypes.ChoiceDiamond,
       text: input.condition,
     }),
diff --git a/Composer/packages/extensions/visual-designer/src/transformers/transformSwitchCondition.ts b/Composer/packages/extensions/visual-designer/src/transformers/transformSwitchCondition.ts
index 0321bc81fb..42dcfbc4c6 100644
--- a/Composer/packages/extensions/visual-designer/src/transformers/transformSwitchCondition.ts
+++ b/Composer/packages/extensions/visual-designer/src/transformers/transformSwitchCondition.ts
@@ -25,7 +25,7 @@ export function transformSwitchCondition(
       ...input,
       $type: ObiTypes.ConditionNode,
     }),
-    choice: new IndexedNode(`${jsonpath}.choice`, {
+    choice: new IndexedNode(`${jsonpath}`, {
       $type: ObiTypes.ChoiceDiamond,
       text: condition,
     }),