Issue #5: final fix