Patch from Patrick Michaud: