Issue #174: finer tuning