lazy load bug fix