Minor tweeks to Issue #14 fix.