Fix issue #1928