possible fix for #376