cherry pick fix for #41