Fix the ID problem.