clienthandler fix
merge