Fix bugs in develop branch
Fix bug in develop