Merge in scottbutcher's change. (Thanks!)