ExternalID change fix