Further fix related to ES update