diff --git a/src/vehicles/Automobile.cpp b/src/vehicles/Automobile.cpp
index 0a577c0c..44b596a1 100644
--- a/src/vehicles/Automobile.cpp
+++ b/src/vehicles/Automobile.cpp
@@ -5740,8 +5740,14 @@ CAutomobile::ShowAllComps(void)
 void
 CAutomobile::ReduceHornCounter(void)
 {
+#ifdef FIX_BUGS
+	// Make horns last longer (only used by AI drivers?)
+	if(m_nCarHornTimer != 0 && CTimer::GetLogicalFramesPassed())
+		m_nCarHornTimer--;
+#else
 	if(m_nCarHornTimer != 0)
 		m_nCarHornTimer--;
+#endif
 }
 
 void
diff --git a/src/vehicles/Bike.cpp b/src/vehicles/Bike.cpp
index 6af3e131..474797e8 100644
--- a/src/vehicles/Bike.cpp
+++ b/src/vehicles/Bike.cpp
@@ -2941,8 +2941,14 @@ CBike::SetupModelNodes(void)
 void
 CBike::ReduceHornCounter(void)
 {
-	if(m_nCarHornTimer != 0)
+	#ifdef FIX_BUGS
+	// Make horns last longer (only used by AI drivers?)
+	if(m_nCarHornTimer != 0 && CTimer::GetLogicalFramesPassed())
 		m_nCarHornTimer--;
+	#else
+		if(m_nCarHornTimer != 0)
+			m_nCarHornTimer--;
+	#endif
 }
 
 #ifdef COMPATIBLE_SAVES