Fixed passing in client