Hi Richard,
[ Nick, you might remember mentioning this bug a few months back. I think I've finally got a proper fix, rather than the failed attempt I originally sent. ]
Thanks for fixing this. I am going to copy your patch into our internal sources and mark it as a local fix on the assumption that it will be approved soon and a merge will make it official.
Cheers Nick