Fix issue #1108