fix BZ923579

[merge]