client api fix
merge