Fix issue #1722