Issue #234