Issue #972