Fixing overwrite of instance variable in Client