Fix issue #1143