Fix lazy loading and turn it on properly