fixed staging bugs in develop branch