Issue #235