Fix the full client