Fixed broken today calculation