lazy loading fixes