StepDone fires early on subroutine calls

[DuncanL]

I have a StepStarting and StepDone handler that I use to time a source control action.

Recently I moved the source control action into a subroutine so I could do several things and call it from multiple places. However this breaks my timing scripts, as the StepDone fires immediately that the subroutine starts

This seems counter intuitive to me - the step hasn't finished - it's waiting on all the subroutine steps. I've attached a simple sample. which outputs:

vbld_StepStarting
vbld_StepDone
Wibble subroutine

what I want to see is:

vbld_StepStarting
Wibble subroutine
vbld_StepDone

Is there any way I can work around this? (Other than moving all the timing out as separate steps before and after the subroutine call - but that's not as neat and means any other users need to know to copy three steps, rather than just one.)