Fixed further concurrent modification