Changed to eager loading