fix bz984481

[merge]