Fix problem with Escort Service.