diff --git a/libfixmath/fix16_trig.c b/libfixmath/fix16_trig.c
index 07c98bd..791bb3e 100644
--- a/libfixmath/fix16_trig.c
+++ b/libfixmath/fix16_trig.c
@@ -113,7 +113,11 @@ fix16_t fix16_cos(fix16_t inAngle)
 
 fix16_t fix16_tan(fix16_t inAngle)
 {
+	#ifndef FIXMATH_NO_OVERFLOW
 	return fix16_sdiv(fix16_sin(inAngle), fix16_cos(inAngle));
+	#elif
+	return fix16_div(fix16_sin(inAngle), fix16_cos(inAngle));
+	#endif
 }
 
 fix16_t fix16_asin(fix16_t x)