fix activate flow