Fixing ESI, this time for real