Fixed issue #1105