See my comment here about this.

- h