possible fix for issue #942