Tenative concurrentmodificationerror fix