Patch attached.

Fixes relative recent thd regression.