issue #1004