more Issue #86 work