Patch in previous post is incomplete ... here's the
full version.

-Tony