Fix bug with having more than one client (add a buffer for each client)