patch from Steve Langasek <vorlon@netexpress.net> to make sure we