rricharz fixed DateAndTime