Fixed issue #1928