Issue #25: tried some things; see issue comments