Possible fix for issue #26