Patch from Paul Haas: