diff --git a/ml_aap/Main.cs b/ml_aap/Main.cs
index 208deef..502c58d 100644
--- a/ml_aap/Main.cs
+++ b/ml_aap/Main.cs
@@ -50,7 +50,7 @@ void OnLocalAvatarClear()
         static void OnLocalAvatarSetup_Postfix() => ms_instance?.OnLocalAvatarSetup();
         void OnLocalAvatarSetup()
         {
-            if(m_localHandler != null)
+            if((m_localHandler != null) && !PlayerSetup.Instance._inVr)
                 m_localHandler.OnAvatarSetup();
         }
     }
diff --git a/ml_aap/ParametersHandler.cs b/ml_aap/ParametersHandler.cs
index 3f00e1b..67e7fbc 100644
--- a/ml_aap/ParametersHandler.cs
+++ b/ml_aap/ParametersHandler.cs
@@ -46,6 +46,12 @@ public ParametersHandler()
             m_parameters = new List<AdditionalParameterInfo>();
         }
 
+        void Start()
+        {
+            if(PlayerSetup.Instance._inVr)
+                PlayerSetup.Instance.avatarSetupCompleted.AddListener(this.OnAvatarSetup);
+        }
+
         void Update()
         {
             if(m_active)
diff --git a/ml_aap/Properties/AssemblyInfo.cs b/ml_aap/Properties/AssemblyInfo.cs
index be4558f..2e5b04e 100644
--- a/ml_aap/Properties/AssemblyInfo.cs
+++ b/ml_aap/Properties/AssemblyInfo.cs
@@ -1,10 +1,10 @@
 using System.Reflection;
 
 [assembly: AssemblyTitle("AdditionalAvatarParameters")]
-[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("1.0.0")]
+[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyFileVersion("1.0.1")]
 
-[assembly: MelonLoader.MelonInfo(typeof(ml_aap.AdditionalAvatarParameters), "AdditionalAvatarParameters", "1.0.0", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_aap.AdditionalAvatarParameters), "AdditionalAvatarParameters", "1.0.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
 [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
 [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
 [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
\ No newline at end of file
diff --git a/ml_fpt/Main.cs b/ml_fpt/Main.cs
index 20e6357..c449fc6 100644
--- a/ml_fpt/Main.cs
+++ b/ml_fpt/Main.cs
@@ -73,6 +73,9 @@ public override void OnUpdate()
                     PlayerSetup.Instance._trackerManager.trackers[m_hipsTrackerIndex].ShowLine(false);
                     CVR_InteractableManager.enableInteractions = true;
 
+                    if(PlayerSetup.Instance._avatar.GetComponent<ABI.CCK.Components.CVRAvatar>().avatarUsesAdvancedSettings)
+                        PlayerSetup.Instance.LoadCurrentAvatarSettingsDefault();
+
                     Reset();
 
                     ShowHudNotification("Calibration completed");
@@ -141,6 +144,9 @@ void OnAvatarClear()
         {
             if(m_inCalibration)
             {
+                m_indexIk.calibrated = true;
+                m_indexIk.enabled = true;
+
                 m_ikCalibrator.leftHandModel.SetActive(false);
                 m_ikCalibrator.rightHandModel.SetActive(false);