Possible fix for issue #115