Issue #9: Fix 4