Michael, try the attached patch.

Andrew