Fix issue #1820