Issue #7 final fix