Resolve Issue #22