Fix issues with more than 2 clients connecting