fixing client handler.......