potential fix for issue #376