fix for Issue #7