Issue #279