Fix problem with ESO service