Fixed issue #1420