should fix the n+1 queries