issue #999, issue #1000