Potential fix for Issue #6