fix bz1006645

[merge]