Fixed issue #1848