Fixed issue #1112