[fixes #43802175] wait to trigger change until we're in a consistent state so we don't try to pick a comparator that doesn't make sense