Hi Alan,

if you can, please test this quick patch.

All tests pass fine but it's not the definitive patch as there
are other issues in this areas we need to check first.  But
tests will help, as always.

Thanks!