FIX: Issue #22