Fix lazy load problem