Contributed by Stephen and Matthew Gaudio.

Patch #566, added on Dec. 11, 1997