fixes crash, but still bugs with "Today"