Fix issue #3219