Fix bug.
Merge remote-tracking branch 'remotes/tangxuehua/master'