Fixed issue #1108

Fixed issue #1108