Issue #984