Issue #966