[FIX] Calendar: Solving date errors