Fix issue #1061