fix a bug in last version
Merge branch 'develop'