Issue #758