Bar Labels on baseline not current bars

Hi,

I am having an issue with the bar labels showing on the far right bar regardless of whether it is a baseline or the current activity bar.  I would like to ensure that my bar labels are always applied to current/remaining bars NOT my baseline.

I have made sure that the Remaining work and actual work bars are above the project baseline bar in the "Bars" table as I know this affects what bar the relationship lines are shown on, however, it doesn't seem to affect the bar labels.  I have also made sure that on the bar labels tab for project basline bars no labels selected, unchecked the current bar labels tab and ensured that the bar lables tab for remaining and actual work bars have lables selected but it still shows on the baseline bars if they are further right than the activity bars!

Any help would be appreciated.

Thanks

Heidi