Handle overlapping activities in client.