Patch from Michael Jerris. darcs-hash:20080121171425-65a35-ed1da84e0e438f4e447963947d89e253a44bd596.gz