Issue #235 new