Issue #975