fix bz1012374 , bz1012901 

[merge]