Issue #258