Fix loading bug