fix bz894976

[merge]