FIX: Issue #4