merge fix
not locked clients