fixed lazy load issue