Fix issue #2979