Fix: temporally broke date calculation