Phase1 server fix