Issue #223, Issue 220