Fixed issue #1158