Fix client reference in CommonUtils