Possible fix for issue 86