Fix phase conditions