fix PR 6157. Testcase pending.