Issue #517