Trying to fix client list