fixed date problem after 6pm