Fix Issue #221