Patch proposal, initial patch, to issue #142