This will fix hairdog's problem, too, I think.