Issue #7: fixed