Issue #241