;; Patch from Mark A. Hershberger.