Issue #14: Another tweak