Fixed staing bugs in develop branch