fix a bug
Merge branch 'lin_branch'