Fix issue #1067