diff --git a/src/types.cpp b/src/types.cpp
index 8711e5e5..bea58c40 100644
--- a/src/types.cpp
+++ b/src/types.cpp
@@ -620,14 +620,12 @@ Rational floatToRationalCast(float f) {
   // Beware: primitive conversion algorithm
   int32_t den = 1000000;
   const auto d_as_long = static_cast<long>(d);
-  if (Safe::abs(d_as_long) > 2147) {
-    den = 10000;
-  }
-  if (Safe::abs(d_as_long) > 214748) {
-    den = 100;
-  }
   if (Safe::abs(d_as_long) > 21474836) {
     den = 1;
+  } else if (Safe::abs(d_as_long) > 214748) {
+    den = 100;
+  } else if (Safe::abs(d_as_long) > 2147) {
+    den = 10000;
   }
   const auto nom = static_cast<int32_t>(std::round(d * den));
   const int32_t g = gcd(nom, den);
diff --git a/unitTests/test_types.cpp b/unitTests/test_types.cpp
index fc901a92..fdc855fc 100644
--- a/unitTests/test_types.cpp
+++ b/unitTests/test_types.cpp
@@ -160,6 +160,62 @@ TEST(Rational, readRationalFromStream) {
   ASSERT_EQ(2, r.second);
 }
 
+TEST(Rational, parseRationalFromStringSuccessfully) {
+  bool ok{false};
+  Rational rational = parseRational("1/2", ok);
+  ASSERT_EQ(std::make_pair(1, 2), rational);
+  ASSERT_TRUE(ok);
+}
+
+TEST(Rational, parseRationalFromLongIsOK) {
+  bool ok{true};
+  Rational rational = parseRational("12", ok);
+  ASSERT_EQ(std::make_pair(12, 1), rational);
+  ASSERT_TRUE(ok);
+}
+
+TEST(Rational, parseRationalFromBoolIsOK) {
+  bool ok{true};
+  Rational rational = parseRational("true", ok);
+  ASSERT_EQ(std::make_pair(1, 1), rational);
+  ASSERT_TRUE(ok);
+
+  rational = parseRational("false", ok);
+  ASSERT_EQ(std::make_pair(0, 1), rational);
+  ASSERT_TRUE(ok);
+}
+
+TEST(Rational, parseRationalFromFloatIsOK) {
+  bool ok{true};
+  Rational rational = parseRational("1.2", ok);
+  ASSERT_EQ(std::make_pair(6, 5), rational);
+  ASSERT_TRUE(ok);
+
+  rational = parseRational("1.4", ok);
+  ASSERT_EQ(std::make_pair(7, 5), rational);
+  ASSERT_TRUE(ok);
+}
+
+TEST(Rational, parseRationalFromFloatWithFCharIsNoOK) {
+  bool ok{true};
+  Rational rational = parseRational("1.2f", ok);
+  ASSERT_EQ(std::make_pair(0, 0), rational);
+  ASSERT_FALSE(ok);
+}
+
+TEST(Rational, floatToRationalCastWorks) {
+  ASSERT_EQ(std::make_pair(6, 5), floatToRationalCast(1.2f));
+  ASSERT_EQ(std::make_pair(11001, 5), floatToRationalCast(2200.2f));
+  ASSERT_EQ(std::make_pair(1100001, 5), floatToRationalCast(220000.2f));
+  ASSERT_EQ(std::make_pair(22000000, 1), floatToRationalCast(22000000.2f));
+  ASSERT_EQ(std::make_pair(22000000, 1), floatToRationalCast(22000000.2f));
+}
+
+TEST(Rational, floatToRationalCastWithIntegersOutOfLimits) {
+  ASSERT_EQ(std::make_pair(1, 0), floatToRationalCast(2247483647.f));
+  ASSERT_EQ(std::make_pair(-1, 0), floatToRationalCast(-2247483647.f));
+}
+
 TEST(URational, toStream) {
   URational r = {1, 2};
   std::stringstream str;