Minor fixed on Client