Connection changes after subprocess collapsed

I have a process like this:

image

When the sub-process is expanded it looks like this

image

How do I solve this when the subflow collapsed and the linkage changes? What I want is the same as the first picture when the user expanded and then collapsed.

image

Generally our tooling tries to preserve existing waypoints; due to the way expanding works in your example awkward waypoints are added, and these are “preserved” during collapse.

What you showcase does not happen if the participant has enough space to expand:capture.SJOMNw_optimized