Add workaround for ES bug