Fix issue #1932