fix Issue #761