Issue #7 fix.