I've opted for a less intrusive fix that Martin proposed, but my fix
is largely a rework of his suggested patch.

Testcase by:	Martin