merge fix
fixed client