Attempt to fix IDs