fix bz977519

[merge]