FIX: Issue #10