Fix loading

Fix loading