Issue #236 new