Fix issue #1740