Fix issue #2695