Possible fix for Issue #1