Fix for Issue #7