Issue #065