fixed lazy loading issue