Fixes #22044 Previous PR (#21874) did not work properly if the BIM WB was the start up WB. A scenario that I forgot to test.