Possible fix for issue #954