OK - in that case I'll let Ted evaluate the details of the fix, but a fix in the wrapper should be perfectly fine.