Fixed issue #1628