Fix auto loading not always triggering.