Multiple concurrent clients fix