fix lazy loading