Fixed issue #1154