Fix issue #3019