Fix loading problems
Fix loading problems