Fixing N+1 query that I introduced

* Yup

[Resolves #62]