Issue #4: Solved