diff --git a/source/common/utility/vectors.h b/source/common/utility/vectors.h
index c6ba414d7..a3c04f32a 100644
--- a/source/common/utility/vectors.h
+++ b/source/common/utility/vectors.h
@@ -1455,7 +1455,8 @@ public:
 
 	double Tan() const
 	{
-		return vec_t(g_tan(Radians()));
+		auto bam = BAMs();
+		return g_sinbam(bam) / g_cosbam(bam);
 	}
 
 	// This is for calculating vertical velocity. For high pitches the tangent will become too large to be useful.