Fix issue #3656