Fixed multiple client handling