Issue #239