* Patch by David Updegraff, 22 Apr 2003: