Fixed stafing bugs in develop branch