ECS fixed zero case, and concurrent modification exception