ACTUALLY fixed the loading time bug this time, I promise (I think)