fixed clientHandler