Fix submitted by Marcus Watts, applied 2001-07-16 to trunk, 2001-10-05
to 1.2.2+ branch, released in 1.2.3.