fixed staging bugs