Fix issue #1888