fix bug
Merge branch 'bug_fix'