cherry pick bugfix.