Issue #1002