Fix loading behaviors