Fix issue #1825