Fixed issue #1654