fix execute bug
Merge branch 'hotfix/1' into develop