fix for bz967706 

[merge]