Fixed stagin bugs in develop branch.