Fix loading troubles