Repair the id issue