Fix to Rest client