Fixed issue #1801