Fixed issue #1709