FIX: Issue #38