avoid some warning
Merge branch 'aszxqw-master'