- Issue #9: Fix 3