Fix eager loading