Finish PR #221