FIX: Issue #28