fixed client issues
fixed client issues