Crowd fix and concurrency fix