Fixed issue #1358