issue #3401: bug fix