Fixed starging bugs in develop branch.