Fixed the loading problems