Fixed issue #1108