fix to lazy loading stuff