Fix issue #1268