Fix issue #1772