Fixed issue #1800
Fixed issue #1802