#18 fixed staging check