Fix issue #1911