bug fix
merge client-server