Try to fix the ids