Fix phase two