fixed stagin bugs in develop branch.