fix bz997078

[merge]