Issue #174: fix the fix...