diff --git a/Models/Instruments/Compass.xml b/Models/Instruments/Compass.xml
index 4745cf45..7e145bfb 100644
--- a/Models/Instruments/Compass.xml
+++ b/Models/Instruments/Compass.xml
@@ -31,10 +31,10 @@
 		<clip>
 			<clipMin>-25</clipMin>
 			<clipMax>25</clipMax>
-			<property>instrumentation/magnetic-compass/roll-deg-final</property>
+			<property>instrumentation/magnetic-compass/roll-deg</property>
 		</clip>
 	</expression>
-	<factor>0.5</factor>
+	<factor>1.0</factor>
 	<axis>
 		<x> 1.0 </x>
 		<y> 0.0 </y>
@@ -48,13 +48,13 @@
 		<clip>
 			<clipMin>-9</clipMin>
 			<clipMax>9</clipMax>
-			<property>instrumentation/magnetic-compass/pitch-deg-final</property>
+			<property>instrumentation/magnetic-compass/pitch-deg</property>
 		</clip>
 	</expression>
-	<factor>0.5</factor>
+	<factor>1.0</factor>
 	<axis>
 		<x>  0.0 </x>
-		<y> -1.0 </y>
+		<y>  1.0 </y>
 		<z>  0.0 </z>
 	</axis>
 </animation>
diff --git a/Systems/instruments.xml b/Systems/instruments.xml
index 34f6ffa6..3048a02a 100644
--- a/Systems/instruments.xml
+++ b/Systems/instruments.xml
@@ -686,47 +686,60 @@
             <property>/instrumentation/magnetic-compass/deviation-deg</property>
         </output>
     </filter>
-    <filter>
-        <name>Magnetic compass pivot mounting</name>
-        <type>exponential</type>
-        <filter-time>5.0</filter-time>
-        <input>
-          <expression>
-            <product>
-              <property>/orientation/pitch-deg</property>
-              <value>-1</value>
-            </product>
-          </expression>
-        </input>
-        <output>
-            <property>/instrumentation/magnetic-compass/pitch-offset-deg</property>
-        </output>
-        <min> <property>instrumentation/magnetic-compass/pitch-limit-down</property> </min>
-        <max> <property>instrumentation/magnetic-compass/pitch-limit-up</property> </max>
-    </filter>
     <filter>
         <name>Magnetic compass stuck</name>
         <type>gain</type>
         <input>
             <condition>
-              <or>
-                <less-than>
-                  <property>/orientation/pitch-deg</property>
-                  <property>instrumentation/magnetic-compass/pitch-limit-down</property>
-                </less-than>
-                <greater-than>
-                  <property>/orientation/pitch-deg</property>
-                  <property>instrumentation/magnetic-compass/pitch-limit-up</property>
-                </greater-than>
-                <less-than>
-                  <property>/orientation/roll-deg</property>
-                  <property>instrumentation/magnetic-compass/roll-limit-left</property>
-                </less-than>
-                <greater-than>
-                  <property>/orientation/roll-deg</property>
-                  <property>instrumentation/magnetic-compass/roll-limit-right</property>
-                </greater-than>
-              </or>
+              <!-- not stuck: look at current animation props -->
+              <and>
+                <not><property>instrumentation/magnetic-compass/stuck</property></not>
+                <or>
+                  <less-than>
+                    <property>/instrumentation/magnetic-compass/pitch-deg</property>
+                    <property>instrumentation/magnetic-compass/pitch-limit-down</property>
+                  </less-than>
+                  <greater-than>
+                    <property>/instrumentation/magnetic-compass/pitch-deg</property>
+                    <property>instrumentation/magnetic-compass/pitch-limit-up</property>
+                  </greater-than>
+                  <less-than>
+                    <property>/instrumentation/magnetic-compass/roll-deg</property>
+                    <property>instrumentation/magnetic-compass/roll-limit-left</property>
+                  </less-than>
+                  <greater-than>
+                    <property>/instrumentation/magnetic-compass/roll-deg</property>
+                    <property>instrumentation/magnetic-compass/roll-limit-right</property>
+                  </greater-than>
+                </or>
+              </and>
+            </condition>
+            <value>1</value>
+        </input>
+        <input>
+            <condition>
+              <!-- stuck: look if normal props are not above limits anymore -->
+              <and>
+                <property>instrumentation/magnetic-compass/stuck</property>
+                <or>
+                  <less-than>
+                    <property>/instrumentation/magnetic-compass/pitch-deg</property>
+                    <property>instrumentation/magnetic-compass/pitch-limit-down</property>
+                  </less-than>
+                  <greater-than>
+                    <property>/instrumentation/magnetic-compass/pitch-deg</property>
+                    <property>instrumentation/magnetic-compass/pitch-limit-up</property>
+                  </greater-than>
+                  <less-than>
+                    <property>/instrumentation/magnetic-compass/roll-deg</property>
+                    <property>instrumentation/magnetic-compass/roll-limit-left</property>
+                  </less-than>
+                  <greater-than>
+                    <property>/instrumentation/magnetic-compass/roll-deg</property>
+                    <property>instrumentation/magnetic-compass/roll-limit-right</property>
+                  </greater-than>
+                </or>
+              </and>
             </condition>
             <value>1</value>
         </input>
@@ -771,40 +784,6 @@
             <property>instrumentation/magnetic-compass/indicated-heading-deg-final</property>
         </output>
     </filter>
-    <filter>
-        <name>Magnetic compass pitch</name>
-        <type>exponential</type>
-        <filter-time>0.25</filter-time> <!-- simulate damping fluid -->
-        <input>
-            <condition>
-                <property>instrumentation/magnetic-compass/stuck</property>
-            </condition>
-            <property>instrumentation/magnetic-compass/pitch-deg-final</property>
-        </input>
-        <input>
-            <property>orientation/pitch-deg</property>
-        </input>
-        <output>
-            <property>instrumentation/magnetic-compass/pitch-deg-final</property>
-        </output>
-    </filter>
-    <filter>
-        <name>Magnetic compass roll</name>
-        <type>exponential</type>
-        <filter-time>0.25</filter-time> <!-- simulate damping fluid -->
-        <input>
-            <condition>
-                <property>instrumentation/magnetic-compass/stuck</property>
-            </condition>
-            <property>instrumentation/magnetic-compass/roll-deg-final</property>
-        </input>
-        <input>
-            <property>orientation/roll-deg</property>
-        </input>
-        <output>
-            <property>instrumentation/magnetic-compass/roll-deg-final</property>
-        </output>
-    </filter>
 
     <!-- VSI damper -->
     <!-- To dampen the needle a bit more, especially at very tiny changes (like parking) -->