Issue #707 Fix