Fix lock contention