Fixed: lazy loading now applied correctly