Possible fix for Issue #111