fix Issue #709