Fixed issue #1497