Tentative fix to the ES bug, now it's time to test it ...