fix cpu utilization problem
Merge branch 'hotfix_issue_2'