Fixed ESA with disambiguator!