Fix issue #2790