diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
index 5134d45b0..20c3d7949 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/models/Habit.kt
@@ -59,10 +59,9 @@ data class Habit(
         val today = DateUtils.getTodayWithOffset()
         val value = computedEntries.get(today).value
         return if (isNumerical) {
-            val targetValuePerDay = (targetValue / frequency.denominator)
             when (targetType) {
-                NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValuePerDay
-                NumericalHabitType.AT_MOST -> value / 1000.0 <= targetValuePerDay
+                NumericalHabitType.AT_LEAST -> value / 1000.0 >= targetValue
+                NumericalHabitType.AT_MOST -> value / 1000.0 <= targetValue
             }
         } else {
             value != Entry.NO && value != Entry.UNKNOWN
@@ -73,10 +72,9 @@ data class Habit(
         val today = DateUtils.getTodayWithOffset()
         val value = computedEntries.get(today).value
         return if (isNumerical) {
-            val targetValuePerDay = (targetValue / frequency.denominator)
             when (targetType) {
-                NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValuePerDay
-                NumericalHabitType.AT_MOST -> value / 1000.0 > targetValuePerDay
+                NumericalHabitType.AT_LEAST -> value / 1000.0 < targetValue
+                NumericalHabitType.AT_MOST -> value / 1000.0 > targetValue
             }
         } else {
             value == Entry.NO
diff --git a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
index dcc7cba24..3ce83c8b3 100644
--- a/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
+++ b/uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt
@@ -117,7 +117,7 @@ class HistoryCardPresenter(
                 } else {
                     entries.map {
                         when {
-                            max(0.0, it.value / 1000.0) < 2 * habit.targetValue -> HistoryChart.Square.ON
+                            max(0.0, it.value / 1000.0) <= habit.targetValue -> HistoryChart.Square.ON
                             else -> HistoryChart.Square.OFF
                         }
                     }