Fix issue #2761