fix up for phase2