Fix issue #1737