Concurrent mod fix 2.0