close #221, Issue #223