minor fix for N+1 loading