diff --git a/src/hackerbase.scm b/src/hackerbase.scm
index b6ded1e..0c619c6 100644
--- a/src/hackerbase.scm
+++ b/src/hackerbase.scm
@@ -86,14 +86,10 @@
 	   (*members-directory* dir))
  (-month (YYYY-MM) "Specify current month"
 	 (-normal-month- #f)
-	 (*current-month* (string->cal-month YYYY-MM))
-	 (*current-day* (make-cal-day (cal-month-year (*current-month*))
-				      (cal-month-month (*current-month*))
-				      1)))
+	 (set-current-month! (string->cal-month YYYY-MM)))
  (-today (YYYY-MM-DD) "Specify current day"
 	 (-normal-month- #f)
-	 (*current-day* (string->cal-day YYYY-MM-DD))
-	 (*current-month* (cal-day->month (*current-day*))))
+	 (set-current-day! (string->cal-day YYYY-MM-DD)))
  (-tstyle (style) "Use given table style: debug, ascii, unicode"
 	  (*table-border-style* (string->symbol style)))
  (-apikey (fname) "File with Fio API keys"