Possible fix for Issue #359