BUG FIX N+1 in Client