Behaviour of relationship lines on collapsed bars

Using P6 Pro R15.1.6.

In an expanded group Gantt layout relationship lines join either the baseline bars or the forecast bars based on the order of the bars in the 'Bars' dialogue.  A user has formatted his layout to show the links between the forecast bars:-

For review in meetings the users is collapsing the bars using the option 'collapse to individual bars to minimise space'.  When collapsing a group the correct data is shown, however the relationship lines revert to linking the baseline activities and not the forecasts:-

I've played with the bar settings and order but cannot get the relationship lines in the collapsed view show between the forecast bars.  Does anyone know how to solve this?