fix compile error
merge origin/master