Fix server (again)