more improvements related to, but not yet fixing, issue #289
1.7.3 alpha