diff --git a/components/tvplanit/source/vpdata.pas b/components/tvplanit/source/vpdata.pas
index e6fa8cc3a..6b8435e96 100644
--- a/components/tvplanit/source/vpdata.pas
+++ b/components/tvplanit/source/vpdata.pas
@@ -1962,11 +1962,11 @@ var
 begin
   result := false;
 
-  DayInRepeatRange := (Day > trunc(Event.StartTime)) and
+  DayInRepeatRange := (Day >= trunc(Event.StartTime)) and
     ((Event.RepeatRangeEnd = 0) or (Day < trunc(Event.RepeatRangeEnd) + 1));
 
   if (Event.RepeatCode <> rtNone) and
-     ((Event.RepeatRangeEnd = 0) or (trunc(Event.RepeatRangeEnd + 1) > now)) then
+     ((Event.RepeatRangeEnd = 0) or (trunc(Event.RepeatRangeEnd + 1) > Day)) then  // wp: was "now" instead of "Day" ????
   begin
     case Event.RepeatCode of
       rtDaily: