Fixed lazy loading issue