Fixed issue #1803