Fixed issue #1643