Fixed Lazy Load Refactoring problem