Minor change in Load method