fix the issues client found