Fixed next client functionality