Potential fix for Issue #16