Fix lazy load!