Fix issue #1974