Fixed n + 1 queries

Redundant `self` detected.