Potential fix for Issue #709