Fix issue - Eager load not works correctly