diff --git a/app/constraints/allowed_to_see_solutions_constraint.rb b/app/constraints/allowed_to_see_solutions_constraint.rb
index f20bb537..d8eeb4b1 100644
--- a/app/constraints/allowed_to_see_solutions_constraint.rb
+++ b/app/constraints/allowed_to_see_solutions_constraint.rb
@@ -2,7 +2,7 @@
 
 class AllowedToSeeSolutionsConstraint
   def matches?(request)
-    return true if Time.now.utc > Aoc.begin_time + (request.params[:day] + 1).days
+    return true if Time.now.utc > Aoc.begin_time.change(day: request.params[:day] + 2)
 
     request.env["warden"]&.user&.solved?(request.params[:day], request.params[:challenge])
   end
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
index 99d7c698..db0a76e6 100644
--- a/app/controllers/pages_controller.rb
+++ b/app/controllers/pages_controller.rb
@@ -17,7 +17,7 @@ def calendar
     ].map do |day|
       {
         parts_solved: user_completions[day] || 0,
-        release_time: Aoc.begin_time + (day - 1).days
+        release_time: Aoc.begin_time.change(day:)
       }
     end