Fix concurrent list modification