fixing cherry pick #1881