REST api client fix