Final fix for loading.