Fixed issue #1143