Issue #236