diff --git a/Code/Base/Powertrain/Clutch.cs b/Code/Base/Powertrain/Clutch.cs
index 90c02a7..9b9e879 100644
--- a/Code/Base/Powertrain/Clutch.cs
+++ b/Code/Base/Powertrain/Clutch.cs
@@ -117,10 +117,10 @@ public partial class Clutch : PowertrainComponent
 					ClutchInput = 1f;
 				}
 				
-				//if (  Controller.SwappedBrakes > 0 )
-				//{
-				//	ClutchInput = 0;
-				//}
+				if ( Controller.SwappedBrakes > 0 && Controller.SwappedThrottle == 0 )
+				{
+					ClutchInput = 0;
+				}
 			}
 			if ( Controller.IsClutching > 0 )
 			{
diff --git a/Code/Input/InputResolver.cs b/Code/Input/InputResolver.cs
index b3282e3..3daada3 100644
--- a/Code/Input/InputResolver.cs
+++ b/Code/Input/InputResolver.cs
@@ -35,6 +35,9 @@ public class InputResolver
 	{
 		get
 		{
+			if ( !IsDriverActive )
+				return 0;
+
 			if ( Input.UsingController )
 				return Input.GetAnalog( InputAnalog.LeftTrigger );
 
@@ -45,6 +48,9 @@ public class InputResolver
 	{
 		get
 		{
+			if ( !IsDriverActive )
+				return 0;
+
 			if ( Input.UsingController )
 				return Input.GetAnalog( InputAnalog.RightTrigger );