One more tweak for Issue #3.