Fix external id