CAS client fix