comb the flow
fix some bug when deploy