Fixed issue #1651