Minor fix

Lazy load bug fixed