Issue #228