Fixed lazy loading.