Fix the loading problem