Fix loading bug
Fix fatal bug