Fix ID Plan