Wed Jul 13 18:14:41 EDT 2011 geoff
    yes, this fix isn't right, but i've found a suitable
    workaround and applied it.