*8315* prevent stage id clobbering