Fixed bug with multiple clients being used