Issue #229