Bug correction in lazy loading