Fix issue #1897