Issue #258 complete