Fix rest client