Restclient fix