... and thought I'd share.  Patch is attached.

Cheers,
Norbert