Added code to fix a problem when OnDemandMongoCLoad is activated