Fixed lazy loading bug