fix bz959221

[merge]