Today
Fix null check using .Equals() instead of == null