possible fix for #2351