Potential fix for Issue #1