Fix the case when org is loaded after us