bug fixed client