Issue #246