Fixed issue #1123