Uclient fix