Possible fix for issue #2257