Contributed by Stephen and Matthew Gaudio.

Patch #497, added on Oct. 10, 1997