FIX: Issue #117