Fixed code to used newest client