Issue #9: Fix #2