Eager load fix