Thread: fix #8417.
Thread fix #8943.